Merge commit 'ca4a8002f895c3474b3a5087ff027c31dadc712f' into master-merge

[xonotic/netradiant.git] / radiant / main.cpp

diff --git a/radiant/main.cpp b/radiant/main.cpp
index 24f4b267824962663d5232e84c90417c99d4759f..ef559617ef9ab088e2ba6e0f5bd01200c809fe8f 100644 (file)
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -529,8 +529,18 @@ int main( int argc, char* argv[] ){
        if ( lib != 0 ) {
                void ( WINAPI *qDwmEnableComposition )( bool bEnable ) = ( void (WINAPI *) ( bool bEnable ) )GetProcAddress( lib, "DwmEnableComposition" );
                if ( qDwmEnableComposition ) {
+                       bool Aero = false;
+                       for ( int i = 1; i < argc; ++i ){
+                               if ( !stricmp( argv[i], "-aero" ) ){
+                                       Aero = true;
+                                       qDwmEnableComposition( TRUE );
+                                       break;
+                               }
+                       }
                        // disable Aero
-                       qDwmEnableComposition( FALSE );
+                       if ( !Aero ){
+                               qDwmEnableComposition( FALSE );
+                       }
                }
                FreeLibrary( lib );
        }
@@ -629,6 +639,12 @@ int main( int argc, char* argv[] ){
 
        hide_splash();
 
+#ifdef WIN32
+       if( openCmdMap[0] != '\0' ){
+               Map_LoadFile( openCmdMap );
+       }
+       else
+#endif // WIN32
        if ( mapname != NULL ) {
                Map_LoadFile( mapname );
        }