diff options
| author | Brandon Schaefer <brandontschaefer@gmail.com> | 2014-03-13 23:17:17 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-03-13 23:17:17 +0000 |
| commit | e44f78c3f4778c537a366cbed752dabfd665cb3a (patch) | |
| tree | 8694a5729b2bbae531a5b2f1e68cf3e7b277a8e2 /plugins/unityshell | |
| parent | 31e6127b7995c13cf3345bcaeb95476784ff40b8 (diff) | |
| parent | d6af4cf32f369159ac761f1851e404b823a32fd6 (diff) | |
If the switcher is open when going into lockscreen, hide it! Fixes: 1292225
(bzr r3724)
Diffstat (limited to 'plugins/unityshell')
| -rw-r--r-- | plugins/unityshell/src/unityshell.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index d670040da..7dd6bb267 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -3723,7 +3723,11 @@ void UnityScreen::OnDashRealized() void UnityScreen::LockscreenRequested() { - if (launcher_controller_->IsOverlayOpen()) + if (switcher_controller_->Visible()) + { + switcher_controller_->Hide(false); + } + else if (launcher_controller_->IsOverlayOpen()) { dash_controller_->HideDash(); hud_controller_->HideHud(); |