From 193354865cccb4e67ca0e51a84ec83fec39633ec Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Tue, 1 Nov 2011 21:17:24 +0000
Subject: [PATCH] another attempt to fix things on macosx

---
 source/glest_game/main/main.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp
index dbb08443..10f2992c 100644
--- a/source/glest_game/main/main.cpp
+++ b/source/glest_game/main/main.cpp
@@ -2846,6 +2846,11 @@ int glestMain(int argc, char** argv) {
     	}
 
     	Renderer &renderer= Renderer::getInstance();
+//#if defined(__APPLE__)
+		program= new Program();
+		mainWindow= new MainWindow(program);
+//#endif
+
         lang.loadStrings(language);
 
         if(	lang.hasString("FONT_HEIGHT_TEXT")) {
@@ -3068,11 +3073,15 @@ int glestMain(int argc, char** argv) {
         //return -1;
         //
 
-		program= new Program();
+		if(program == NULL) {
+			program= new Program();
+		}
 
 		SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
 
-		mainWindow= new MainWindow(program);
+		if(mainWindow == NULL) {
+			mainWindow= new MainWindow(program);
+		}
 
 		mainWindow->setUseDefaultCursorOnly(config.getBool("No2DMouseRendering","false"));