macos: process the texture browser redraw as soon as possible when workarounding...

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

diff --git a/radiant/main.cpp b/radiant/main.cpp
index 172c3fa92db5532fc1062c61b36221cfe1bc04b7..83dc58f9d0a63616fb2b35c1039576282b2a65fa 100644 (file)
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -64,8 +64,6 @@
 #include "main.h"
 #include "globaldefs.h"
 
-#include "version.h"
-
 #include "debugging/debugging.h"
 
 #include "iundo.h"
@@ -505,6 +503,10 @@ void user_shortcuts_save(){
 }
 
 int main( int argc, char* argv[] ){
+#if GTK_TARGET == 3
+       // HACK: force legacy GL backend as we don't support GL3 yet
+       setenv("GDK_GL", "LEGACY", 0);
+#endif
        crt_init();
 
        streams_init();
@@ -537,9 +539,9 @@ int main( int argc, char* argv[] ){
        // Gtk already removed parsed `--options`
        if ( argc == 2 ) {
                if ( strlen( argv[ 1 ] ) > 1 ) {
-                       if ( g_str_has_suffix( argv[ 1 ], ".map" ) ) {
-                               mapname = argv[ 1 ];
+                       mapname = argv[ 1 ];
 
+                       if ( g_str_has_suffix( mapname, ".map" ) ) {
                                if ( !g_path_is_absolute( mapname ) ) {
                                        mapname = g_build_filename( g_get_current_dir(), mapname, NULL );
                                }
@@ -551,6 +553,7 @@ int main( int argc, char* argv[] ){
                        }
                        else {
                                g_print( "bad file name, will not load: %s\n", mapname );
+                               mapname = NULL;
                        }
                }
        }