summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOwen W. Taylor <otaylor@fishsoup.net>2013-03-18 14:16:41 -0400
committerOwen W. Taylor <otaylor@fishsoup.net>2013-03-18 15:10:18 -0400
commit8a33880c00cd994e70bdbe5198e712408a3d175e (patch)
tree09647d4c7a35ac81c0a9790aa1ee90e4344b2493 /src
parent7a8c45dda8d1ae7c57be69be1afd2d28528d8c37 (diff)
downloadmutter-8a33880c00cd994e70bdbe5198e712408a3d175e.tar.gz
Don't configure a window before it responds to _NET_WM_SYNC_REQUEST
In 97a4cc8c, we accidentally lost the check that kept us from sending multiple configures to a window before it responds to _NET_WM_SYNC_REQUEST. So _NET_WM_SYNC_REQUEST stopped working properly. Add a check back with the same effect. https://bugzilla.gnome.org/show_bug.cgi?id=696091
Diffstat (limited to 'src')
-rw-r--r--src/core/window.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/core/window.c b/src/core/window.c
index d97303971..40f1b015e 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -9413,6 +9413,15 @@ update_resize (MetaWindow *window,
break;
}
+#ifdef HAVE_XSYNC
+ /* If we're waiting for a request for _NET_WM_SYNC_REQUEST, we'll
+ * resize the window when the window responds, or when we time
+ * the response out.
+ */
+ if (window->sync_request_timeout_id != 0)
+ return;
+#endif
+
if (!check_moveresize_frequency (window, &remaining) && !force)
{
/* we are ignoring an event here, so we schedule a