don't try to access empty wxIconBundle in gtk_frame_realized_callback

[wxWidgets.git] / src / x11 / utils.cpp

diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index df9d4f9da5b42e29040cc2e3a1017e953feec1c7..80e3fcacdabbe901de175ab01000f63d2e717206 100644 (file)
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -110,6 +110,7 @@ void wxCheckForFinishedChildren()
       // Map empty, delete it.
       delete gs_procmap;
       gs_procmap = NULL;
+      return;
     }
     for (it = gs_procmap->begin();it != gs_procmap->end(); ++it)
     {
@@ -272,8 +273,11 @@ void wxCloseDisplay()
 
 bool wxSetDisplay(const wxString& displayName)
 {
-    Display *
-        dpy = XOpenDisplay(displayName.empty() ? NULL : displayName.mb_str());
+    Display *dpy = XOpenDisplay
+                   (
+                    displayName.empty() ? NULL
+                                        : (const char *)displayName.mb_str()
+                   );
 
     if ( !dpy )
     {