added an error popup on startup when the sound couldn't be initialised. Closes #425

3 files changed, 6 insertions, 1 deletions

diff --git a/src/engine/client.h b/src/engine/client.h
index a0ebb3e7..2da2bd8b 100644
--- a/src/engine/client.h
+++ b/src/engine/client.h
@@ -130,6 +130,8 @@ public:
 	virtual const char *ErrorString() = 0;
 	virtual const char *LatestVersion() = 0;
 	virtual bool ConnectionProblems() = 0;
+
+	virtual bool SoundInitFailed() = 0;
 };
 
 class IGameClient : public IInterface
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 9b8c4151..3652b272 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -1803,7 +1803,7 @@ void CClient::Run()
 	m_pEditor->Init();
 
 	// init sound, allowed to fail
-	Sound()->Init();
+	m_SoundInitFailed = Sound()->Init() != 0;
 
 	// load data
 	if(!LoadData())
diff --git a/src/engine/client/client.h b/src/engine/client/client.h
index f25e7cf7..8ba70662 100644
--- a/src/engine/client/client.h
+++ b/src/engine/client/client.h
@@ -142,6 +142,7 @@ class CClient : public IClient, public CDemoPlayer::IListner
 	int m_SnapCrcErrors;
 	bool m_AutoScreenshotRecycle;
 	bool m_EditorActive;
+	bool m_SoundInitFailed;
 
 	int m_AckGameTick;
 	int m_CurrentRecvTick;
@@ -235,6 +236,8 @@ public:
 
 	virtual bool ConnectionProblems();
 
+	virtual bool SoundInitFailed() { return m_SoundInitFailed; }
+
 	void DirectInput(int *pInput, int Size);
 	void SendInput();