From ca341ca5a6b69c395850ae32b55d7550cf8e1a1d Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 23 Sep 2003 22:22:23 +0000 Subject: Check for NULL return of gtk_get_current_event. Fixes bug #123063. 2003-09-24 Christian Persch * src/window-commands.c: (window_cmd_view_reload): Check for NULL return of gtk_get_current_event. Fixes bug #123063. --- ChangeLog | 6 ++++++ src/window-commands.c | 23 +++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index d85fc4163..d195669b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-09-24 Christian Persch + + * src/window-commands.c: (window_cmd_view_reload): + + Check for NULL return of gtk_get_current_event. Fixes bug #123063. + 2003-09-23 Marco Pesenti Gritti * src/ephy-automation.c: (ephy_automation_factory_new): diff --git a/src/window-commands.c b/src/window-commands.c index bb2286848..5f5dea0d5 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -210,18 +210,21 @@ window_cmd_view_reload (GtkAction *action, g_return_if_fail (embed != NULL); event = gtk_get_current_event (); - type = event->type; - - if (type == GDK_BUTTON_RELEASE) - { - state = event->button.state; - } - else if (type == GDK_KEY_RELEASE) + if (event) { - state = event->key.state; - } + type = event->type; + + if (type == GDK_BUTTON_RELEASE) + { + state = event->button.state; + } + else if (type == GDK_KEY_RELEASE) + { + state = event->key.state; + } - gdk_event_free (event); + gdk_event_free (event); + } if (state & GDK_SHIFT_MASK) { -- cgit v1.2.3