summaryrefslogtreecommitdiff
path: root/src/Label.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/Label.c')
-rw-r--r--src/Label.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Label.c b/src/Label.c
index f2882f2..029fdb8 100644
--- a/src/Label.c
+++ b/src/Label.c
@@ -527,6 +527,8 @@ XawLabelInitialize(Widget request, Widget cnew,
LabelWidget lw = (LabelWidget)cnew;
if (!lw->label.font) XtError("Aborting: no font found\n");
+ if (lw->simple.international && !lw->label.fontset)
+ XtError("Aborting: no fontset found\n");
if (lw->label.label == NULL)
lw->label.label = XtNewString(lw->core.name);
@@ -722,8 +724,8 @@ XawLabelSetValues(Widget current, Widget request, Widget cnew,
if (curlw->label.encoding != newlw->label.encoding)
was_resized = True;
- if (curlw->label.fontset != newlw->label.fontset &&
- curlw->simple.international)
+ if (curlw->simple.international
+ && curlw->label.fontset != newlw->label.fontset)
was_resized = True;
if (curlw->label.label != newlw->label.label) {