From 267a42c31c8368a1d1ed6dcab0e3527a5d345446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 4 Nov 2013 14:06:33 +0100 Subject: [PATCH] screencast: Fix disabling screencasts via session mode If screencasts are disabled, we return a DBus error, but still start the recording happily - add early returns in that case. https://bugzilla.gnome.org/show_bug.cgi?id=699752 --- js/ui/screencast.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/js/ui/screencast.js b/js/ui/screencast.js index 5b3c41922..85ce4d789 100644 --- a/js/ui/screencast.js +++ b/js/ui/screencast.js @@ -103,8 +103,10 @@ const ScreencastService = new Lang.Class({ ScreencastAsync: function(params, invocation) { let returnValue = [false, '']; - if (!Main.sessionMode.allowScreencast) + if (!Main.sessionMode.allowScreencast) { invocation.return_value(GLib.Variant.new('(bs)', returnValue)); + return; + } let sender = invocation.get_sender(); let recorder = this._ensureRecorderForSender(sender); @@ -122,8 +124,10 @@ const ScreencastService = new Lang.Class({ ScreencastAreaAsync: function(params, invocation) { let returnValue = [false, '']; - if (!Main.sessionMode.allowScreencast) + if (!Main.sessionMode.allowScreencast) { invocation.return_value(GLib.Variant.new('(bs)', returnValue)); + return; + } let sender = invocation.get_sender(); let recorder = this._ensureRecorderForSender(sender);