Allocate/Deallocate ShutdownNotifier when needed.

(bzr r3874.1.14)

1 files changed, 2 insertions, 2 deletions

diff --git a/lockscreen/LockScreenController.cpp b/lockscreen/LockScreenController.cpp
index dac382e0d..346a04944 100644
--- a/lockscreen/LockScreenController.cpp
+++ b/lockscreen/LockScreenController.cpp
@@ -60,7 +60,6 @@ Controller::Controller(DBusManager::Ptr const& dbus_manager,
 , session_manager_(session_manager)
 , upstart_wrapper_(upstart_wrapper)
 , shield_factory_(shield_factory)
- , shutdown_notifier_(std::make_shared<ShutdownNotifier>())
 , suspend_notifier_(std::make_shared<SuspendNotifier>())
 , fade_animator_(LOCK_FADE_DURATION)
 , blank_window_animator_(IDLE_FADE_DURATION)
@@ -443,6 +442,7 @@ void Controller::LockScreen()
 indicators_ = std::make_shared<indicator::LockScreenDBusIndicators>();
 upstart_wrapper_->Emit("desktop-lock");
 
+ shutdown_notifier_ = std::make_shared<ShutdownNotifier>();
 shutdown_notifier_->RegisterInterest([](){
 WindowManager::Default().UnmapAllNoNuxWindowsSync();
 });
@@ -485,7 +485,7 @@ void Controller::SimulateActivity()
 
 void Controller::OnUnlockRequested()
 {
- shutdown_notifier_->UnregisterInterest();
+ shutdown_notifier_.reset();
 
 lockscreen_timeout_.reset();
 screensaver_post_lock_timeout_.reset();