[svn-upgrade] Integrating new upstream version, ion3 (20071220)

[ion3.git] / ioncore / binding.c

diff --git a/ioncore/binding.c b/ioncore/binding.c
index 740e67baa6cf09dc862e0cebf60ef3a67449c478..cad47d334350c3761e1f6fb59acb943e2d29f76e 100644 (file)
--- a/ioncore/binding.c
+++ b/ioncore/binding.c
@@ -381,7 +381,7 @@ void binding_grab_on(const WBinding *binding, Window win)
        binding->act!=BINDING_BUTTONMOTION)
         return;
     
-    if(binding->state==0)
+    if(binding->state==0 || binding->area!=0)
         return;
     
 #ifndef CF_HACK_IGNORE_EVIL_LOCKS
@@ -412,7 +412,7 @@ void binding_ungrab_on(const WBinding *binding, Window win)
        binding->act!=BINDING_BUTTONMOTION)
         return;
     
-    if(binding->state==0)
+    if(binding->state==0 || binding->area!=0)
         return;
 
 #ifndef CF_HACK_IGNORE_EVIL_LOCKS