From 27852934693bc8e3192bd06378095e457d436e71 Mon Sep 17 00:00:00 2001
From: oy <Tom_Adams@web.de>
Date: Fri, 6 Jan 2012 20:03:57 +0100
Subject: don't start playing the music again if we're quitting

---
 src/engine/client/client.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/engine/client/client.cpp')

diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 34923f28..8faf1e41 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -461,6 +461,9 @@ int *CClient::GetInput(int Tick)
 // ------ state handling -----
 void CClient::SetState(int s)
 {
+	if(m_State == IClient::STATE_QUITING)
+		return;
+
 	int Old = m_State;
 	if(g_Config.m_Debug)
 	{
@@ -1842,7 +1845,10 @@ void CClient::Run()
 
 		// panic quit button
 		if(Input()->KeyPressed(KEY_LCTRL) && Input()->KeyPressed(KEY_LSHIFT) && Input()->KeyPressed('q'))
+		{
+			Quit();
 			break;
+		}
 
 		if(Input()->KeyPressed(KEY_LCTRL) && Input()->KeyPressed(KEY_LSHIFT) && Input()->KeyDown('d'))
 			g_Config.m_Debug ^= 1;
-- 
cgit 1.4.1