LockScreenAcceleratorController: ensure callbacks are valid before calling them (LP: #1605012)

Approved by: Andrea Azzarone (bzr r4160)

1 files changed, 14 insertions, 4 deletions

diff --git a/lockscreen/LockScreenAcceleratorController.cpp b/lockscreen/LockScreenAcceleratorController.cpp
index 26c3495ce..49dbd3bf1 100644
--- a/lockscreen/LockScreenAcceleratorController.cpp
+++ b/lockscreen/LockScreenAcceleratorController.cpp
@@ -193,11 +193,21 @@ void AcceleratorController::OnActionActivated(CompAction& action)
 
 CompOption::Vector options;
 
- if (action.initiate() && action.state() & CompAction::StateInitKey)
- action.initiate()(&action, 0, options);
+ if (action.state() & CompAction::StateInitKey)
+ {
+ auto const& initiate_cb = action.initiate();
+
+ if (!initiate_cb.empty())
+ initiate_cb(&action, 0, options);
+ }
 
- if (action.terminate() && action.state() & CompAction::StateTermKey)
- action.terminate()(&action, CompAction::StateTermTapped, 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