Fix crash on OK after Save Changes in Tags and Comment popup.

[xboard.git] / xoptions.c

diff --git a/xoptions.c b/xoptions.c
index 7e7eed8..437ebae 100644 (file)
--- a/xoptions.c
+++ b/xoptions.c
@@ -673,7 +673,6 @@ void RefreshColor(int source, int n)
 {
     int col, j, r, g, b, step = 10;
     char *s, buf[MSG_SIZ]; // color string
-    Arg args[5];
     GetWidgetText(&currentOption[source], &s);
     if(sscanf(s, "#%x", &col) != 1) return;   // malformed
     b = col & 0xFF; g = col & 0xFF00; r = col & 0xFF0000;
@@ -1396,7 +1395,7 @@ int NewComCallback(int n)
 
 void SaveChanges(int n)
 {
-    GetWidgetText(&currentOption[0], &commentText);
+    GenericReadout(0);
     ReplaceComment(commentIndex, commentText);
 }
 
@@ -1423,7 +1422,6 @@ void ClearComment(int n)
 
 void NewCommentPopup(char *title, char *text, int index)
 {
-    Widget edit;
     Arg args[16];
 
     if(shells[1]) { // if already exists, alter title and content
@@ -1438,7 +1436,7 @@ void NewCommentPopup(char *title, char *text, int index)
        XtOverrideTranslations(commentOptions[0].handle, XtParseTranslationTable(commentTranslations));
 }
 
-static char *tagsText, *msgText;
+static char *tagsText;
 
 int NewTagsCallback(int n)
 {
@@ -1448,7 +1446,7 @@ int NewTagsCallback(int n)
 
 void changeTags(int n)
 {
-    GetWidgetText(&currentOption[1], &tagsText);
+    GenericReadout(1);
     if(bookUp) SaveToBook(tagsText); else
     ReplaceTags(tagsText, &gameInfo);
 }
@@ -1462,7 +1460,6 @@ Option tagsOptions[] = {
 
 void NewTagsPopup(char *text, char *msg)
 {
-    Widget edit;
     Arg args[16];
     char *title = bookUp ? _("Edit book") : _("Tags");
 
@@ -1514,12 +1511,11 @@ void TypeInProc(w, event, prms, nprms)
      String *prms;
      Cardinal *nprms;
 {
-    Arg args[2];
-    String val;
+    char *val;
 
     if(prms[0][0] == '1') {
        GetWidgetText(&boxOptions[0], &val);
-       TypeInDoneEvent((char*)val);
+       TypeInDoneEvent(val);
     }
     PopDown(0);
 }
@@ -1645,7 +1641,6 @@ void SetRandom(int n)
 {
     int r = n==2 ? -1 : rand() & (1<<30)-1;
     char buf[MSG_SIZ];
-    Arg args[2];
     snprintf(buf, MSG_SIZ,  "%d", r);
     SetWidgetText(&shuffleOptions[1], buf, 0);
     SetWidgetState(&shuffleOptions[0], True);