diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp
index bbc6e6db..23972232 100644
--- a/source/g3d_viewer/main.cpp
+++ b/source/g3d_viewer/main.cpp
@@ -189,7 +189,7 @@ MainWindow::MainWindow(	std::pair<string,vector<string> > unitToLoad,
 						float defaultZoom,float defaultXRot, float defaultYRot)
     :	wxFrame(NULL, -1, ToUnicode(winHeader),
     	        wxPoint(Renderer::windowX, Renderer::windowY),
-		        wxSize(Renderer::windowW, Renderer::windowH)), model(NULL), glCanvas(NULL), renderer(NULL)
+		        wxSize(Renderer::windowW, Renderer::windowH)), model(NULL), glCanvas(NULL), renderer(NULL), initTextureManager(true)
 {
     //getGlPlatformExtensions();
 	int args[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER,  WX_GL_MIN_ALPHA,  8  }; // to prevent flicker
@@ -1026,7 +1026,9 @@ void MainWindow::loadParticle(string path) {
 
                 if(path != "" && fileExists(path) == true) {
                     renderer->initModelManager();
-                    renderer->initTextureManager();
+                    if(initTextureManager) {
+                    	renderer->initTextureManager();
+                    }
                 }
 			}
 		}
@@ -1127,7 +1129,9 @@ void MainWindow::loadProjectileParticle(string path) {
 
 		if(path != "" && fileExists(path) == true) {
 			renderer->initModelManager();
-			renderer->initTextureManager();
+            if(initTextureManager) {
+            	renderer->initTextureManager();
+            }
 		}
 	}
 	}
@@ -1226,7 +1230,9 @@ void MainWindow::loadSplashParticle(string path) {  // uses ParticleSystemTypeSp
 
 		if(path != "" && fileExists(path) == true) {
 			renderer->initModelManager();
-			renderer->initTextureManager();
+            if(initTextureManager) {
+            	renderer->initTextureManager();
+            }
 		}
 	}
 	}
@@ -1567,7 +1573,9 @@ void MainWindow::onMenuRestart(wxCommandEvent &event) {
 		loadSplashParticle(""); // as above
 
 		renderer->initModelManager();
-		renderer->initTextureManager();
+        if(initTextureManager) {
+        	renderer->initTextureManager();
+        }
 		timer->Start(100);
 	}
 	catch(std::runtime_error e) {
diff --git a/source/g3d_viewer/main.h b/source/g3d_viewer/main.h
index ea6861f6..87d02e47 100644
--- a/source/g3d_viewer/main.h
+++ b/source/g3d_viewer/main.h
@@ -91,6 +91,7 @@ private:
 	float backBrightness, gridBrightness, lightBrightness;
 	int lastX, lastY;
 	Renderer::PlayerColor playerColor;
+	bool initTextureManager;
 
 	std::vector<UnitParticleSystemType *> unitParticleSystemTypes;
 	std::vector<UnitParticleSystem *> unitParticleSystems;