1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c
index 719bca469..02f9d6de8 100644
--- a/xorg-server/dix/dixfonts.c
+++ b/xorg-server/dix/dixfonts.c
@@ -136,6 +136,7 @@ SetDefaultFont(char *defaultfontname)
     int         err;
     FontPtr     pf;
     XID         fid;
+    static FontPtr last_pf;
 
     fid = FakeClientID(0);
     err = OpenFont(serverClient, fid, FontLoadAll | FontOpenSync,
@@ -143,9 +144,10 @@ SetDefaultFont(char *defaultfontname)
     if (err != Success)
 	return FALSE;
     pf = (FontPtr) LookupIDByType(fid, RT_FONT);
-    if (pf == (FontPtr) NULL)
+    if (pf != (FontPtr) NULL) last_pf = pf;
+    if (last_pf == (FontPtr) NULL)
 	return FALSE;
-    defaultFont = pf;
+    defaultFont = last_pf;
     return TRUE;
 }