Merge pull request #923 from Tarik-B/TB-PLAY-BUTTON-LINUX

Fixed issue #588: stop button now changes back to play after stopping project (Linux)

AUTHORS.md

@@ -33,6 +33,8 @@
 
 - JimMarlowe (https://github.com/JimMarlowe)
 
+- Tarik Belabbas (https://github.com/Tarik-B)
+
 ### Contribution Copyright and Licensing
 
 Atomic Game Engine contribution copyrights are held by their authors.  Each author retains the copyright to their contribution and agrees to irrevocably license the contribution under the Atomic Game Engine Contribution License `CONTRIBUTION_LICENSE.md`.  Please see `CONTRIBUTING.md` for more details.

Source/Atomic/IPC/IPCUnix.cpp

@@ -24,9 +24,6 @@
 
 #include "IPCUnix.h"
 
-namespace Atomic
-{
-
 #include <unistd.h>
 #include <signal.h>
 #include <sys/socket.h>
@@ -36,6 +33,13 @@ namespace Atomic
 #include <libproc.h>
 #endif
 
+#ifdef ATOMIC_PLATFORM_LINUX
+#include <sys/wait.h>
+#endif
+
+namespace Atomic
+{
+
 #define HANDLE_EINTR(x) ({ \
     typeof(x) __eintr_result__; \
     do { \
@@ -176,15 +180,22 @@ bool IPCProcess::IsRunning()
     if (pid_ == -1)
         return false;
 
-#ifdef __APPLE__
+#if defined(ATOMIC_PLATFORM_OSX)
     char pathbuf[PROC_PIDPATHINFO_MAXSIZE];
     int ret = proc_pidpath (pid_, pathbuf, sizeof(pathbuf));
     if ( ret > 0 )
     {
         return true;
     }
+#elif defined(ATOMIC_PLATFORM_LINUX)
+    int status;
+    pid_t childPid = waitpid( pid_, &status, WNOHANG );
+    bool childRunning = !WIFEXITED( status ) && !WIFSIGNALED( status ) && !WIFSTOPPED( status );
+    if ( childPid != pid_ || childRunning )
+    {
+        return true;
+    }
 #else
-
     // this doesn't seem to work on OSX?
     if (kill(pid_, 0) == 0)
         return true;