From 3dec45fffae6f38a5f7822c2c098d14628a277bf Mon Sep 17 00:00:00 2001
From: Dennis Kasprzyk <onestone@compiz-fusion.org>
Date: Mon, 22 Dec 2008 14:17:10 +0100
Subject: Compare actions before grab setting.

---
 src/option.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/option.cpp b/src/option.cpp
index dc51252..9739ab8 100644
--- a/src/option.cpp
+++ b/src/option.cpp
@@ -585,6 +585,15 @@ CompOption::rest ()
 bool
 CompOption::set (CompOption::Value &val)
 {
+    if (priv->type == CompOption::TypeKey ||
+	priv->type == CompOption::TypeButton ||
+	priv->type == CompOption::TypeEdge ||
+	priv->type == CompOption::TypeBell)
+	val.action ().copyState (priv->value.action ());
+
+    if (priv->value == val)
+	return false;
+
     if (isAction () &&
         priv->value.action ().state () & CompAction::StateAutoGrab && screen)
     {
@@ -597,15 +606,6 @@ CompOption::set (CompOption::Value &val)
 	    screen->removeAction (&priv->value.action ());
 	}
     }
-    
-    if (priv->type == CompOption::TypeKey ||
-	priv->type == CompOption::TypeButton ||
-	priv->type == CompOption::TypeEdge ||
-	priv->type == CompOption::TypeBell)
-	val.action ().copyState (priv->value.action ());
-
-    if (priv->value == val)
-	return false;
 
     switch (priv->type)
     {
-- 
cgit v1.1