Joined with branch XORG-6_8_2.lg3d-rel-0-6-2lg3d-masterlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-2lg3d-dev-0-6-1-1

1 files changed, 4 insertions, 0 deletions

diff --git a/src/Tip.c b/src/Tip.c
index 97c527b..0acfb2c 100644
--- a/src/Tip.c
+++ b/src/Tip.c
@@ -243,6 +243,10 @@ XawTipInitialize(Widget req, Widget w, ArgList args, Cardinal *num_args)
     TipWidget tip = (TipWidget)w;
     XGCValues values;
 
+    if (!tip->tip.font) XtError("Aborting: no font found\n");
+    if (tip->tip.international && !tip->tip.fontset)
+	XtError("Aborting: no fontset found\n");
+    
     tip->tip.timer = 0;
 
     values.foreground = tip->tip.foreground;