Radiant:

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

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 0dbb6a0b736e1f1eeb7d059fbf5edaca4dfe3785..d18a152e8333fdc3efcbe67ef4bcc3bc2c1ba118 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -1423,8 +1423,9 @@ gboolean TextureBrowser_button_press( GtkWidget* widget, GdkEventButton* event,
                        }
                }
        }
-       else if ( event->type == GDK_2BUTTON_PRESS ) {
-               const char* sh = textureBrowser->shader.c_str();
+       else if ( event->type == GDK_2BUTTON_PRESS && event->button == 1 ) {
+               CopiedString texName = textureBrowser->shader;
+               const char* sh = texName.c_str();
                char* dir = strrchr( sh, '/' );
                if( dir != NULL ){
                        *(dir + 1) = '\0';
@@ -1434,12 +1435,13 @@ gboolean TextureBrowser_button_press( GtkWidget* 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 );
                                }
                        }
                }
        }
-       else if ( event->type == GDK_3BUTTON_PRESS ) {
+       else if ( event->type == GDK_2BUTTON_PRESS && event->button == 3 ) {
                ScopeDisableScreenUpdates disableScreenUpdates( TextureBrowser_getComonShadersDir(), "Loading Textures" );
                TextureBrowser_ShowDirectory( *textureBrowser, TextureBrowser_getComonShadersDir() );
                TextureBrowser_queueDraw( *textureBrowser );