aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 422800f3765..b6728880f5d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6809,9 +6809,10 @@ handle_one_xevent (struct x_display_info *dpyinfo,
6809 { 6809 {
6810 dpyinfo->grabbed |= (1 << event->xbutton.button); 6810 dpyinfo->grabbed |= (1 << event->xbutton.button);
6811 dpyinfo->last_mouse_frame = f; 6811 dpyinfo->last_mouse_frame = f;
6812 6812#if ! defined (USE_GTK)
6813 if (!tool_bar_p) 6813 if (f && !tool_bar_p)
6814 last_tool_bar_item = -1; 6814 f->last_tool_bar_item = -1;
6815#endif /* not USE_GTK */
6815 } 6816 }
6816 else 6817 else
6817 dpyinfo->grabbed &= ~(1 << event->xbutton.button); 6818 dpyinfo->grabbed &= ~(1 << event->xbutton.button);
@@ -10555,7 +10556,6 @@ x_initialize (void)
10555 baud_rate = 19200; 10556 baud_rate = 19200;
10556 10557
10557 x_noop_count = 0; 10558 x_noop_count = 0;
10558 last_tool_bar_item = -1;
10559 any_help_event_p = 0; 10559 any_help_event_p = 0;
10560 ignore_next_mouse_click_timeout = 0; 10560 ignore_next_mouse_click_timeout = 0;
10561 10561