Merge lp:~3v1n0/unity/accelerators-controller-trigger-fix into lp:unity

[Marco Trevisan (Treviño)]

LockScreenAcceleratorController: ensure callbacks are valid before calling them

[Andrea Azzarone (azzar1)]

-1

review: Approve

=== modified file 'lockscreen/LockScreenAcceleratorController.cpp'
--- lockscreen/LockScreenAcceleratorController.cpp	2016-07-26 09:23:27 +0000
+++ lockscreen/LockScreenAcceleratorController.cpp	2016-07-26 09:23:27 +0000
@@ -193,11 +193,21 @@
 
   CompOption::Vector options;
 
-  if (action.initiate() && action.state() & CompAction::StateInitKey)
-    action.initiate()(&action, 0, options);
-
-  if (action.terminate() && action.state() & CompAction::StateTermKey)
-    action.terminate()(&action, CompAction::StateTermTapped, options);
+  if (action.state() & CompAction::StateInitKey)
+  {
+    auto const& initiate_cb = action.initiate();
+
+    if (!initiate_cb.empty())
+      initiate_cb(&action, 0, options);
+  }
+
+  if (action.state() & CompAction::StateTermKey)
+  {
+    auto const& terminate_cb = action.terminate();
+
+    if (!terminate_cb.empty())
+      terminate_cb(&action, CompAction::StateTermTapped, options);
+  }
 }
 
 Accelerators::Ptr const& AcceleratorController::GetAccelerators() const