diff options
| author | Andrea Azzarone <azzaronea@gmail.com> | 2014-06-07 16:27:08 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-06-07 16:27:08 +0000 |
| commit | a3b3e822ccef2748f55aa0bb31aa8e264543c277 (patch) | |
| tree | 97ef1924d6536215f64b15977a2ba796aa1a79de /plugins | |
| parent | a5d80fed5eb2210daefc8d66d945acdcdd5929c4 (diff) | |
| parent | cef7e7f3512c145bbd57062c70194aa64b49c022 (diff) | |
Pass the correct options to showLauncherKeyTerminate in UnityScreen::OnLockScreen Fixes: 1320438
(bzr r3819)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/unityshell/src/unityshell.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index 170e2bd1b..a35a6e46a 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -3815,8 +3815,12 @@ void UnityScreen::OnScreenLocked() screen->removeAction(&action); // We notify that super/alt have been released, to avoid to leave unity in inconsistent state - showLauncherKeyTerminate(&optionGetShowLauncher(), CompAction::StateTermKey, getOptions()); - showMenuBarTerminate(&optionGetShowMenuBar(), CompAction::StateTermKey, getOptions()); + CompOption::Vector options(8); + options[7].setName("time", CompOption::TypeInt); + options[7].value().set((int) screen->getCurrentTime()); + + showLauncherKeyTerminate(&optionGetShowLauncher(), CompAction::StateTermKey, options); + showMenuBarTerminate(&optionGetShowMenuBar(), CompAction::StateTermKey, options); } void UnityScreen::OnScreenUnlocked() |
