Avoid crash when wxGUIAppTraits::GetToolkitInfo is called too

early.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 691ae9e8f4b88c2aca3255eb97ba88c5b03ef7a6..13133ceeac0062366d5306fc326dffeec9bc1525 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -155,8 +155,11 @@ wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
     // Motif version of the libs but the X protocol
     // version!
     Display *display = wxGlobalDisplay();
-    info.versionMajor = ProtocolVersion (display);
-    info.versionMinor = ProtocolRevision (display);
+    if (display)
+    {
+        info.versionMajor = ProtocolVersion (display);
+        info.versionMinor = ProtocolRevision (display);
+    }
     info.os = wxMOTIF_X;
     return info;
 }