debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ensure we have a window in _action_reload_stop_activate

Browse source
This commit is contained in:
Christian Dywan 2012-02-26 00:02:59 +01:00
parent 7c7be5644d
commit 61af413407
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
midori/midori-browser.c
View file

@ -3284,13 +3284,14 @@ _action_reload_stop_activate (GtkAction* action,
{ {
GdkModifierType state = (GdkModifierType)0; GdkModifierType state = (GdkModifierType)0;
gint x, y; gint x, y;
GdkWindow* window;
gboolean from_cache = TRUE; gboolean from_cache = TRUE;
if (!strcmp (gtk_action_get_name (action), "ReloadUncached")) if (!strcmp (gtk_action_get_name (action), "ReloadUncached"))
from_cache = FALSE; from_cache = FALSE;
else else if ((window = gtk_widget_get_window (GTK_WIDGET (browser))))
{ {
gdk_window_get_pointer (NULL, &x, &y, &state); gdk_window_get_pointer (window, &x, &y, &state);
if (state & GDK_SHIFT_MASK) if (state & GDK_SHIFT_MASK)
from_cache = FALSE; from_cache = FALSE;
} }