From 95ad9d470e7117fe5c4171605c5948d721994110 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Tue, 28 Oct 2003 22:51:41 +0000
Subject:         * unix/tkUnixFont.c (GetFontAttributes): place extra check
 for NULL         family against bad X servers.

---
 unix/tkUnixFont.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index 581e727..bf1c8b0 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUnixFont.c,v 1.20 2003/07/19 01:44:57 hobbs Exp $
+ * RCS: @(#) $Id: tkUnixFont.c,v 1.21 2003/10/28 22:51:41 hobbs Exp $
  */
  
 #include "tkUnixInt.h"
@@ -2716,6 +2716,13 @@ GetFontAttributes(display, fontStructPtr, faPtr)
     } else {
 	TkInitFontAttributes(&faPtr->fa);
 	TkInitXLFDAttributes(&faPtr->xa);
+    }
+    /*
+     * Do last ditch check for family.  It seems that some X servers can
+     * fail on the X font calls above, slipping through earlier checks.
+     * X-Win32 5.4 is one of these.
+     */
+    if (faPtr->fa.family == NULL) {
 	faPtr->fa.family = Tk_GetUid("");
 	faPtr->xa.foundry = Tk_GetUid("");
 	faPtr->xa.charset = Tk_GetUid("");
-- 
cgit v0.12