reverted Julian's r44600, it broke help window behavior so that it prevented apps...

[wxWidgets.git] / src / gtk / utilsgtk.cpp

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index dde2a7bff9203cf2b12e5fbf29fbdc5465f8e3dd..e7b6208cec83e197b923869302bf5f93a8f689a4 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -224,15 +224,27 @@ void GTK_EndProcessDetector(gpointer data, gint source,
    int status = 0;
    int rc = waitpid(pid, &status, WNOHANG);
 
    int status = 0;
    int rc = waitpid(pid, &status, WNOHANG);
 

-   if ( rc == 0 )
-   {
-       // no, it didn't exit yet, continue waiting
-       return;
-   }
+    if ( rc == 0 )
+    {
+        // This can only happen if the child application closes our dummy
+        // pipe that is used to monitor its lifetime; in that case, our
+        // best bet is to pretend the process did terminate, because
+        // otherwise wxExecute() would hang indefinitely
+        // (OnExceptionWaiting() won't be called again, the descriptor
+        // is closed now).
+        wxLogDebug("Child process (PID %i) still alive, even though notification was received that it terminated.", pid);
+    }
+    else if ( rc == -1 )
+    {
+        // As above, if waitpid() fails, the best we can do is to log the
+        // error and pretend the child terminated:
+        wxLogSysError(_("Failed to check child process' status"));
+    }

 
    // set exit code to -1 if something bad happened
 
    // set exit code to -1 if something bad happened

-   proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status)
-                                                      : -1;
+   proc_data->exitcode = (rc > 0 && WIFEXITED(status))
+                         ? WEXITSTATUS(status)
+                         : -1;

 
    // child exited, end waiting
    close(source);
 
    // child exited, end waiting
    close(source);


@@ -540,7 +552,7 @@ wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
             names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));
 
             const gchar * const entryDesc = entries[n].description;
             names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));
 
             const gchar * const entryDesc = entries[n].description;

-            desc.push_back(entryDesc ? wxString(entryDesc) : _T(""));
+            desc.push_back(wxString(entryDesc));

         }
 
         g_option_group_free (gtkOpts);
         }
 
         g_option_group_free (gtkOpts);