Compiz Viewport Switcher Plugin

Merge lp:~compiz-team/compiz-vpswitch-plugin/compiz-vpswitch-plugin.fix_772151 into lp:compiz-vpswitch-plugin

Proposed by Sam Spilsbury on 2011-10-11

Status:

Merged

Merged at revision:

Proposed branch:

Merge into:

Diff against target:

1 file modified

src/vpswitch.cpp (+4/-2)

To merge this branch:

bzr merge lp:~compiz-team/compiz-vpswitch-plugin/compiz-vpswitch-plugin.fix_772151

Related bugs:

Medium

Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Jason Smith (community)		2011-10-11	Approve on 2011-10-11
Review via email: mp+78938@code.launchpad.net

Revision history for this message

Jason Smith (jassmith) wrote on 2011-10-11:

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

 	    opt.type () == CompOption::TypeButton ||
 	    opt.type () == CompOption::TypeEdge ||
 	    opt.type () == CompOption::TypeBell)
-	    if (opt.name () == optionGetInitAction ())
+	    if (opt.name () == optionGetInitAction () &&
+		opt.value ().action ().initiate ())
 	    {
 		rv = opt.value ().action ().initiate ()
 		     (action, state, options);
 	    opt.type () == CompOption::TypeButton ||
 	    opt.type () == CompOption::TypeEdge ||
 	    opt.type () == CompOption::TypeBell)
-	    if (opt.name () == optionGetInitAction ())
+	    if (opt.name () == optionGetInitAction () &&
+		opt.value ().action ().terminate ())
 	    {
 		rv = opt.value ().action ().terminate ()
 		     (action, state, options);