summaryrefslogtreecommitdiff
path: root/src/option.cpp
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz-fusion.org>2009-11-16 21:32:43 +0100
committerDennis Kasprzyk <onestone@compiz-fusion.org>2009-11-16 21:32:43 +0100
commit22b578dc60b02c99288dc7dfc9d339b1d432fc18 (patch)
treeac73d902bfb5f1a92b3ba2b6f1682d2f336cf915 /src/option.cpp
parent73797b972fb74a96b341e670e9aa5aa6abbd46e6 (diff)
downloadunity-window-decorator-22b578dc60b02c99288dc7dfc9d339b1d432fc18.tar.gz
unity-window-decorator-22b578dc60b02c99288dc7dfc9d339b1d432fc18.tar.bz2
Fixed action option handling.
Diffstat (limited to 'src/option.cpp')
-rw-r--r--src/option.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/option.cpp b/src/option.cpp
index c2b6cee..a301e7d 100644
--- a/src/option.cpp
+++ b/src/option.cpp
@@ -770,12 +770,14 @@ CompOption::set (CompOption::Value &val)
return false;
case CompOption::TypeKey:
- if (!(val.action ().type () & CompAction::BindingTypeKey))
+ if (val.action ().type () == value().action ().type () &&
+ !(val.action ().type () & CompAction::BindingTypeKey))
return false;
break;
case CompOption::TypeButton:
- if (!(val.action ().type () & (CompAction::BindingTypeButton |
+ if (val.action ().type () == value().action ().type () &&
+ !(val.action ().type () & (CompAction::BindingTypeButton |
CompAction::BindingTypeEdgeButton)))
return false;
break;