Merge lp:~alan-griffiths/compiz-core/Bug.808007 into lp:compiz-core

[Alan Griffiths]

[Alan Griffiths (alan-griffiths)]

The probem occurs when plugins have an action that has neither initiate or terminate set. (SHift switcher had this problem - c.f. lp:~sil2100/compiz-shift-plugin/terminate_button)

[Daniel van Vugt (vanvugt)]

Looks right.

review: Approve

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-03-12 10:35:21 +0000
+++ src/event.cpp	2012-03-19 09:28:20 +0000
@@ -163,15 +163,18 @@
         }
     }
 
-    if (action->initiate ().empty () && !action->terminate ().empty ())
-    {
-        /* Default Initiate implementation for plugins that only
-           provide a Terminate callback */
-        if (state & CompAction::StateInitKey)
-            action->setState (action->state () | CompAction::StateTermKey);
-    }
-    else if (action->initiate () (action, state, arguments))
-        actionEventHandled = true;
+    if (!action->initiate ().empty ())
+    {
+	if (action->initiate () (action, state, arguments))
+	    actionEventHandled = true;
+    }
+    else if (!action->terminate ().empty ())
+    {
+	/* Default Initiate implementation for plugins that only
+	   provide a Terminate callback */
+	if (state & CompAction::StateInitKey)
+	    action->setState (action->state () | CompAction::StateTermKey);
+    }
 
     return actionEventHandled;
 }