Merge commit 'c5065eecd29651649c2f3d04be8af9a19d189733' into master-merge

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

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index f1cc83f5bee9abd7a5429a6dc0c77e33eccdf0ff..46f8c390033596ccf9e0c78e4598c25dcae20d81 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -1579,9 +1579,10 @@ gboolean TextureBrowser_button_press( ui::Widget widget, GdkEventButton* event,
                        }
                }
        }
-       else if ( event->type == GDK_2BUTTON_PRESS ) {
+       else if ( event->type == GDK_2BUTTON_PRESS && event->button == 1 ) {
                #define GARUX_DISABLE_2BUTTON
                #ifndef GARUX_DISABLE_2BUTTON
+               CopiedString texName = textureBrowser->shader;
                const char* sh = textureBrowser->shader.c_str();
                char* dir = strrchr( sh, '/' );
                if( dir != NULL ){
@@ -1592,13 +1593,14 @@ gboolean TextureBrowser_button_press( ui::Widget widget, GdkEventButton* event,
                                if( *dir != '\0'){
                                        ScopeDisableScreenUpdates disableScreenUpdates( dir, "Loading Textures" );
                                        TextureBrowser_ShowDirectory( *textureBrowser, dir );
+                                       TextureBrowser_Focus( *textureBrowser, textureBrowser->shader.c_str() );
                                        TextureBrowser_queueDraw( *textureBrowser );
                                }
                        }
                }
                #endif
        }
-       else if ( event->type == GDK_3BUTTON_PRESS ) {
+       else if ( event->type == GDK_2BUTTON_PRESS && event->button == 3 ) {
                ScopeDisableScreenUpdates disableScreenUpdates( TextureBrowser_getCommonShadersDir(), "Loading Textures" );
                TextureBrowser_ShowDirectory( *textureBrowser, TextureBrowser_getCommonShadersDir() );
                TextureBrowser_queueDraw( *textureBrowser );