more timeout fixing

[xonotic/xonotic.git] / misc / tools / xonotic-map-compiler

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index bfc6593b5f8a665646a6ee9c0849b73c27f9efec..7a114e5223f045686a15a695e5fbdee2f064bbf6 100755 (executable)
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -183,16 +183,15 @@ sub q3map2(@)
                or die "fork: $!";
        if($pid) # parent
        {
-               if($timeout)
-               {
-                       local $SIG{ALRM} = sub { kill $pid; };
-                       alarm $timeout;
-               }
-               if(waitpid $pid, 0 != $pid)
+               local $SIG{ALRM} = sub { warn "SIGALRM caught\n"; kill $pid; };
+               alarm $timeout
+                       if $timeout;
+               if(waitpid($pid, 0) != $pid)
                {
                        die "waitpid: did not return our child process $pid: $!";
                }
-               return !$?;
+               alarm 0;
+               return ($? == 0);
        }
        else # child
        {