summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorErkin Bahceci <erkinbah@gmail.com>2009-08-23 09:40:53 -0500
committerErkin Bahceci <erkinbah@gmail.com>2009-08-23 09:40:53 -0500
commit89989e50d43d06b1394a44e76b7d5cc15f75fba2 (patch)
tree7573eeb0940a99f463cbe97ace43e861058c6c1e /src
parentf03d3057100193256aa83963081186bd153de64b (diff)
downloadzcomp-89989e50d43d06b1394a44e76b7d5cc15f75fba2.tar.gz
zcomp-89989e50d43d06b1394a44e76b7d5cc15f75fba2.tar.bz2
Avoid setting XSelectInput to NoEventMask for grabWindow.
Prevents compiz from getting stuck at termination in ~CompWindow().
Diffstat (limited to 'src')
-rw-r--r--src/window.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/window.cpp b/src/window.cpp
index ba67108..e70ea23 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -4958,7 +4958,8 @@ CompWindow::~CompWindow ()
if (screen->XShape ())
XShapeSelectInput (screen->dpy (), priv->id, NoEventMask);
- XSelectInput (screen->dpy (), priv->id, NoEventMask);
+ if (priv->id != screen->priv->grabWindow)
+ XSelectInput (screen->dpy (), priv->id, NoEventMask);
XUngrabButton (screen->dpy (), AnyButton, AnyModifier, priv->id);
}