X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=38c7c3f76fc26a95f1cdd0051325dd42f8acc03d;hb=55517059338842241bcc8d82b1dec21e92b138da;hp=b5ba50dfef714cbd5ea7caa56e21a4f869916264;hpb=bf3465a52edbeb1d394a4f3ffc766890c4a1aab5;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index b5ba50d..38c7c3f 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -1231,7 +1231,7 @@ ParseFontName(char *name, MyFontParams *mfp)
   q = strchr(p, ':');
   if (q) {
     if (q - p >= sizeof(mfp->faceName))
-      ExitArgError(_("Font name too long:"), name);
+      ExitArgError(_("Font name too long:"), name, TRUE);
     memcpy(mfp->faceName, p, q - p);
     mfp->faceName[q - p] = NULLCHAR;
     p = q + 1;
@@ -1240,12 +1240,12 @@ ParseFontName(char *name, MyFontParams *mfp)
     while (*p && !isdigit(*p)) {
       *q++ = *p++;
       if (q - mfp->faceName >= sizeof(mfp->faceName))
-	ExitArgError(_("Font name too long:"), name);
+	ExitArgError(_("Font name too long:"), name, TRUE);
     }
     while (q > mfp->faceName && q[-1] == ' ') q--;
     *q = NULLCHAR;
   }
-  if (!*p) ExitArgError(_("Font point size missing:"), name);
+  if (!*p) ExitArgError(_("Font point size missing:"), name, TRUE);
   mfp->pointSize = (float) atof(p);
   mfp->bold = (strchr(p, 'b') != NULL);
   mfp->italic = (strchr(p, 'i') != NULL);
@@ -1351,7 +1351,7 @@ ParseBoardSize(void *addr, char *name)
     }
     bs++;
   }
-  ExitArgError(_("Unrecognized board size value"), name);
+  ExitArgError(_("Unrecognized board size value"), name, TRUE);
 }
 
 void
@@ -5621,7 +5621,7 @@ MyLoadSound(MySound *ms)
   struct stat st;
   FILE *f;
 
-  if (ms->data) free(ms->data);
+  if (ms->data && ms->flag) free(ms->data);
   ms->data = NULL;
 
   switch (ms->name[0]) {
@@ -5642,6 +5642,7 @@ MyLoadSound(MySound *ms)
       HANDLE h = FindResource(hInst, ms->name + 1, "WAVE");
       if (h == NULL) break;
       ms->data = (void *)LoadResource(hInst, h);
+      ms->flag = 0; // not maloced, so cannot be freed!
       if (h == NULL) break;
       ok = TRUE;
     }
@@ -5652,6 +5653,7 @@ MyLoadSound(MySound *ms)
     if (f == NULL) break;
     if (fstat(fileno(f), &st) < 0) break;
     ms->data = malloc(st.st_size);
+    ms->flag = 1;
     if (fread(ms->data, st.st_size, 1, f) < 1) break;
     fclose(f);
     ok = TRUE;
@@ -8602,6 +8604,12 @@ PlayAlarmSound()
   MyPlaySound(&sounds[(int)SoundAlarm]);
 }
 
+VOID
+PlayTellSound()
+{
+  MyPlaySound(&textAttribs[ColorTell].sound);
+}
+
 
 VOID
 EchoOn()