summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui_beval.c8
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gui_beval.c b/src/gui_beval.c
index fe930f3fa..ae7845660 100644
--- a/src/gui_beval.c
+++ b/src/gui_beval.c
@@ -1193,11 +1193,13 @@ drawBalloon(beval)
XmFontList fl;
fl = gui_motif_fontset2fontlist(&gui.tooltip_fontset);
- if (fl != NULL)
+ if (fl == NULL)
{
- XmStringExtent(fl, s, &w, &h);
- XmFontListFree(fl);
+ XmStringFree(s);
+ return;
}
+ XmStringExtent(fl, s, &w, &h);
+ XmFontListFree(fl);
}
w += gui.border_offset << 1;
h += gui.border_offset << 1;
diff --git a/src/version.c b/src/version.c
index d6c1eb3a0..3fdfae549 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 342,
+/**/
341,
/**/
340,