X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09d68ec1c35deb4fe3bd5b3ad61d7adcbd260bb3..567f21d2cd0a33e16ee08796e2b0e776b51db1bf:/src/unix/utilsunx.cpp

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 9118bcb7b1..77d6e83d38 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -298,19 +298,30 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
     }
     while ( rc == -1 && errno == EINTR );
 
-
-    if( rc == -1 || ! (WIFEXITED(status) || WIFSIGNALED(status)) )
+    if (rc == -1)
+    {
+        // JACS: this could happen if the process was terminated and waitpid called,
+        // so commenting out for now.
+        //wxLogSysError(_("Waiting for subprocess termination failed (return code = -1)"));
+    }
+    else if (! (WIFEXITED(status)))
     {
-       // wxLogSysError(_("Waiting for subprocess termination failed"));
+        wxLogSysError(_("Waiting for subprocess termination failed (WIFEXITED returned zero)"));
+	
+       /* AFAIK, this can only happen if something went wrong within
+          wxGTK, i.e. due to a race condition or some serious bug.
+          After having fixed the order of statements in
+          GTK_EndProcessDetector(). (KB)
+       */
+    }
+    else if (WIFSIGNALED(status))
+    {
+        wxLogSysError(_("Waiting for subprocess termination failed (signal not caught)"));
+	
        /* AFAIK, this can only happen if something went wrong within
           wxGTK, i.e. due to a race condition or some serious bug.
           After having fixed the order of statements in
           GTK_EndProcessDetector(). (KB)
-
-          JACS adds -- I have other code that kills a process recursively
-          and calls waitpid; so this function then generates an error.
-          I've commented out the wxLogSysError and the 'else' so that
-          termination is always done properly.
        */
     }
     // else