From 1d5b4e5b2f1bbf92c23cd454fdf4dd0db691ed56 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 28 Apr 2014 17:25:39 -0400 Subject: [PATCH] display: Remove the same checks in end_grab_op --- src/core/display.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/core/display.c b/src/core/display.c index 8b3297b13..041393b06 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -1877,8 +1877,7 @@ meta_display_end_grab_op (MetaDisplay *display, g_signal_emit (display, display_signals[GRAB_OP_END], 0, display->screen, display->grab_window, display->grab_op); - if (display->grab_window != NULL && - meta_grab_op_is_moving_or_resizing (display->grab_op)) + if (meta_grab_op_is_moving_or_resizing (display->grab_op)) { /* Clear out the edge cache */ meta_display_cleanup_edges (display); @@ -1906,10 +1905,7 @@ meta_display_end_grab_op (MetaDisplay *display, { meta_topic (META_DEBUG_WINDOW_OPS, "Ungrabbing all keys timestamp %u\n", timestamp); - if (display->grab_window) - meta_window_ungrab_all_keys (display->grab_window, timestamp); - else - meta_screen_ungrab_all_keys (display->screen, timestamp); + meta_window_ungrab_all_keys (display->grab_window, timestamp); } tracker = meta_cursor_tracker_get_for_screen (display->screen);