X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b886fae6484edbb3a2fdbe8be74b3a840e9c84ee..9859d369b49e35a1cad0f760173e165f974fb6cb:/src/x11/utils.cpp

diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index df9d4f9da5..80e3fcacda 100644
--- 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 )
     {