From ae632f4d7ae291ab9982343a83e56f0f5f23fcd6 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Wed, 17 Mar 2010 18:04:44 +0000
Subject: [PATCH] Attempt for bugfix to resume from msgbox

---
 source/glest_game/main/program.cpp | 10 ++++++----
 source/glest_game/main/program.h   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/source/glest_game/main/program.cpp b/source/glest_game/main/program.cpp
index 5cb4bc76c..858fce2d8 100644
--- a/source/glest_game/main/program.cpp
+++ b/source/glest_game/main/program.cpp
@@ -256,7 +256,7 @@ void Program::exit() {
 
 // ==================== PRIVATE ====================
 
-void Program::init(WindowGl *window){
+void Program::init(WindowGl *window, bool initSound){
 
 	this->window= window;
 	Config &config= Config::getInstance();
@@ -299,8 +299,10 @@ void Program::init(WindowGl *window){
 	renderer.init();
 
 	//sound
-	SoundRenderer &soundRenderer= SoundRenderer::getInstance();
-	soundRenderer.init(window);
+	if(initSound == true) {
+        SoundRenderer &soundRenderer= SoundRenderer::getInstance();
+        soundRenderer.init(window);
+	}
 
 	NetworkInterface::setAllowGameDataSynchCheck(Config::getInstance().getBool("AllowGameDataSynchCheck","0"));
 	NetworkInterface::setAllowDownloadDataSynch(Config::getInstance().getBool("AllowDownloadDataSynch","0"));
@@ -378,7 +380,7 @@ void Program::showMessage(const char *msg) {
 #endif
 
     //MainWindow *mainWindow= new MainWindow(this);
-	init(this->window);
+	init(this->window,false);
     setState(originalState);
 	//this->programState = originalState;
 
diff --git a/source/glest_game/main/program.h b/source/glest_game/main/program.h
index d23ea7122..05f43f51a 100644
--- a/source/glest_game/main/program.h
+++ b/source/glest_game/main/program.h
@@ -127,7 +127,7 @@ public:
 	void exit();
 
 private:
-	void init(WindowGl *window);
+	void init(WindowGl *window, bool initSound=true);
 	void setDisplaySettings();
 	void restoreDisplaySettings();
 };