summaryrefslogtreecommitdiff
path: root/shutdown
diff options
authorAndrea Azzarone <azzaronea@gmail.com>2014-12-10 15:24:06 +0100
committerAndrea Azzarone <azzaronea@gmail.com>2014-12-10 15:24:06 +0100
commit1c2c2ed8421a4ef02f6810884427d749be72ed38 (patch)
treef13318a87b76f33e22d7e85dcb31cfc3538b99cb /shutdown
parent41b61acafe6f593806e48142191ad281275f7270 (diff)
Ungrab the shoutdown dialog as soon as possible.
Fixes LP: #1398287 (bzr r3893.1.1)
Diffstat (limited to 'shutdown')
-rw-r--r--shutdown/SessionController.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/shutdown/SessionController.cpp b/shutdown/SessionController.cpp
index f465a8022..fff0759a1 100644
--- a/shutdown/SessionController.cpp
+++ b/shutdown/SessionController.cpp
@@ -178,13 +178,16 @@ void Controller::CancelAndHide()
void Controller::Hide()
{
if (view_window_)
+ {
+ view_window_->UnGrabPointer();
+ view_window_->UnGrabKeyboard();
+
animation::StartOrReverse(fade_animator_, animation::Direction::BACKWARD);
+ }
}
void Controller::CloseWindow()
{
- view_window_->UnGrabPointer();
- view_window_->UnGrabKeyboard();
view_window_->ShowWindow(false);
view_window_->EnableInputWindow(false);