merge
authorunc0rr
Sun, 27 Feb 2011 20:15:48 +0300
changeset 4964 b3fa88210570
parent 4962 705c6186ad9d (diff)
parent 4963 59c2489afcbd (current diff)
child 4965 e57a679943c2
child 4966 fa612a614317
merge
--- a/gameServer/Actions.hs	Sun Feb 27 11:46:41 2011 -0500
+++ b/gameServer/Actions.hs	Sun Feb 27 20:15:48 2011 +0300
@@ -416,6 +416,6 @@
 
 processAction (RestartServer force) = do
     if force then do
-        throw ShutdownException
+        throw RestartException
         else
         processAction $ ModifyServerInfo (\s -> s{restartPending=True})
--- a/gameServer/hedgewars-server.hs	Sun Feb 27 11:46:41 2011 -0500
+++ b/gameServer/hedgewars-server.hs	Sun Feb 27 20:15:48 2011 +0300
@@ -7,6 +7,7 @@
 import Control.Concurrent.Chan
 import qualified Control.Exception as E
 import System.Log.Logger
+import System.Process
 -----------------------------------
 import Opts
 import CoreTypes
@@ -43,7 +44,7 @@
 handleRestart :: ShutdownException -> IO ()
 handleRestart ShutdownException = return ()
 handleRestart RestartException = do
-    
+    _ <- createProcess (proc "./hedgewars-server" [])
     return ()
 
 main :: IO ()