Scale: Correctly detect the activation of a scale and set scale_just_activated_

to true properly. Fixes LP: #1288789 (bzr r3779.2.1)

1 files changed, 3 insertions, 3 deletions

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index d8879fd49..8a815f4f9 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1984,10 +1984,10 @@ void UnityScreen::handleCompizEvent(const char* plugin,
 ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
 }
 
- if (adapter.IsScaleActive() && g_strcmp0(plugin, "scale") == 0 &&
- super_keypressed_)
+ if (super_keypressed_ && g_strcmp0(plugin, "scale") == 0 &&
+ g_strcmp0(event, "activate") == 0)
 {
- scale_just_activated_ = true;
+ scale_just_activated_ = CompOption::getBoolOptionNamed(option, "active");
 }
 
 screen->handleCompizEvent(plugin, event, option);