summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authormonsta <[email protected]>2015-12-11 15:12:54 +0300
committermonsta <[email protected]>2015-12-11 15:12:54 +0300
commit7040bfa954775937bf3d524d8b714335adb766fa (patch)
tree1690ac740046419f02003ff3d7fefe9d71acd4ca /src/core
parent0cfb02ca611bc305d768c3caaaae7e56ccbeb877 (diff)
downloadmarco-7040bfa954775937bf3d524d8b714335adb766fa.tar.bz2
marco-7040bfa954775937bf3d524d8b714335adb766fa.tar.xz
add a missing line from metacity
line is taken from https://github.com/GNOME/metacity/commit/632d3983fbc402432c6ceae05bea8903ad2f11c0 was forgotten in https://github.com/mate-desktop/marco/commit/ad9db61aabc2cbf743a1157ddc42ff76127f3fab
Diffstat (limited to 'src/core')
-rw-r--r--src/core/window.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/window.c b/src/core/window.c
index 461d38fb..e1d60199 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4850,6 +4850,7 @@ meta_window_configure_request (MetaWindow *window,
window->desc);
}
else if (active_window &&
+ !meta_window_same_application (window, active_window) &&
!meta_window_same_client (window, active_window) &&
XSERVER_TIME_IS_BEFORE (window->net_wm_user_time,
active_window->net_wm_user_time))