# HG changeset patch
# User unc0rr
# Date 1298826948 -10800
# Node ID b3fa882105704337b29c1d7f6dafa25ccab1f033
# Parent  705c6186ad9d7c57b2d62cab0a21d92b98b78ad5# Parent  59c2489afcbd9c76d0ca7c8ca1907896e86ac140
merge

diff -r 59c2489afcbd -r b3fa88210570 gameServer/Actions.hs
--- 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})
diff -r 59c2489afcbd -r b3fa88210570 gameServer/hedgewars-server.hs
--- 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 ()