summaryrefslogtreecommitdiff
path: root/UnityCore
diff options
authorAndrea Azzarone <azzaronea@gmail.com>2016-05-31 16:57:10 +0200
committerAndrea Azzarone <azzaronea@gmail.com>2016-05-31 16:57:10 +0200
commit1732c90d4f9176ea42b67eeac99a54952fb4b45a (patch)
tree32bcf73b0f5fa1ae172507cc686452e391b850a9 /UnityCore
parent1b50bc472726ded1db2db5d747be168a6867d2ca (diff)
Do not trigger screensaver on session inactive.
Fixes LP: #1587507 (bzr r4121.5.1)
Diffstat (limited to 'UnityCore')
-rw-r--r--UnityCore/GnomeSessionManager.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/UnityCore/GnomeSessionManager.cpp b/UnityCore/GnomeSessionManager.cpp
index 4fd67807f..4c59ece30 100644
--- a/UnityCore/GnomeSessionManager.cpp
+++ b/UnityCore/GnomeSessionManager.cpp
@@ -117,8 +117,9 @@ GnomeManager::Impl::Impl(GnomeManager* manager, bool test_mode)
login_proxy_->ConnectProperty("Active", [this] (GVariant* variant) {
bool active = glib::Variant(variant).GetBool();
- manager_->screensaver_requested.emit(!active);
manager_->is_session_active.changed.emit(active);
+ if (active)
+ manager_->screensaver_requested.emit(false);
});
manager_->is_session_active.SetGetterFunction([this] {