# HG changeset patch
# User unc0rr
# Date 1299959725 -10800
# Node ID 312f4dd41753825e6778abff0cd3efbcec56d9db
# Parent  72d8fb26223d3f2f79c76229e03561641c1fcf68
Better quit message

diff -r 72d8fb26223d -r 312f4dd41753 gameServer/ClientIO.hs
--- a/gameServer/ClientIO.hs	Sat Mar 12 22:42:01 2011 +0300
+++ b/gameServer/ClientIO.hs	Sat Mar 12 22:55:25 2011 +0300
@@ -66,11 +66,14 @@
     if isQuit answer then
         do
         Exception.handle (\(_ :: Exception.IOException) -> putStrLn "error on sClose") $ sClose s
-        killReciever "Connection closed"
+        killReciever . B.unpack $ quitMessage answer
         else
         clientSendLoop s tId cChan chan ci
 
     where
         killReciever = Exception.throwTo tId . ShutdownThreadException
+        quitMessage ["BYE"] = "bye"
+        quitMessage ("BYE":msg:_) = msg
+        quitMessage _ = error "quitMessage"
         isQuit ("BYE":_) = True
         isQuit _ = False
diff -r 72d8fb26223d -r 312f4dd41753 gameServer/CoreTypes.hs
--- a/gameServer/CoreTypes.hs	Sat Mar 12 22:42:01 2011 +0300
+++ b/gameServer/CoreTypes.hs	Sat Mar 12 22:55:25 2011 +0300
@@ -210,5 +210,5 @@
      deriving Typeable
 
 instance Show ShutdownThreadException where
-    show (ShutdownThreadException s) = "kill: " ++ s
+    show (ShutdownThreadException s) = s
 instance Exception ShutdownThreadException