--- a/hedgewars/CCHandlers.inc	Thu Jun 19 20:34:53 2008 +0000
+++ b/hedgewars/CCHandlers.inc	Sun Jun 22 19:26:01 2008 +0000
@@ -29,9 +29,23 @@
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure chQuit(var s: shortstring);
+const prevGState: TGameState = gsConfirm;
 begin
-SendIPC('Q');
-GameState:= gsExit
+if GameState <> gsConfirm then
+        begin
+        prevGState:= GameState;
+        GameState:= gsConfirm
+        end else
+        GameState:= prevGState
+end;
+
+procedure chConfirm(var s: shortstring);
+begin
+if GameState = gsConfirm then
+	begin
+	SendIPC('Q');
+	GameState:= gsExit
+	end
 end;
 
 procedure chCheckProto(var s: shortstring);