diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp
index 748e561e..8f5c05f9 100644
--- a/source/g3d_viewer/main.cpp
+++ b/source/g3d_viewer/main.cpp
@@ -356,14 +356,14 @@ MainWindow::MainWindow(	std::pair<string,vector<string> > unitToLoad,
 	//timer->Start(100);
 
 	// For windows register g3d file extension to launch this app
-#ifdef WIN32
+#if defined(WIN32) && !defined(__MINGW32__)
 	// example from: http://stackoverflow.com/questions/1387769/create-registry-entry-to-associate-file-extension-with-application-in-c
 	//[HKEY_CURRENT_USER\Software\Classes\blergcorp.blergapp.v1\shell\open\command]
 	//@="c:\path\to\app.exe \"%1\""
 	//[HKEY_CURRENT_USER\Software\Classes\.blerg]
 	//@="blergcorp.blergapp.v1"
 
-	//Open the registry key.
+	//Open the registry key.
 	string subKey = "Software\\Classes\\megaglest.g3d\\shell\\open\\command";
 	HKEY keyHandle;
 	DWORD dwDisposition;