From 1b3ef0948227ad978035dbe09518fb8b3afcae2f Mon Sep 17 00:00:00 2001 From: UshakovVasilii Date: Sat, 11 Apr 2015 10:09:52 +0300 Subject: [PATCH] fix regression with lockMonitor, #5 --- .../bumblebeeNvidiaUtil.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/freon@UshakovVasilii_Github.yahoo.com/bumblebeeNvidiaUtil.js b/freon@UshakovVasilii_Github.yahoo.com/bumblebeeNvidiaUtil.js index 0abcb59..106dd55 100644 --- a/freon@UshakovVasilii_Github.yahoo.com/bumblebeeNvidiaUtil.js +++ b/freon@UshakovVasilii_Github.yahoo.com/bumblebeeNvidiaUtil.js @@ -31,14 +31,12 @@ const BumblebeeNvidiaUtil = new Lang.Class({ } } let lockFilePath = '/tmp/.X' + virtualDisplay + '-lock'; - if(GLib.file_test(lockFilePath, GLib.FileTest.EXISTS)){ - this._lockMonitor = Gio.File.new_for_path( - lockFilePath).monitor_file(Gio.FileMonitorFlags.NONE, null - ); - this._lockMonitor.id = this._lockMonitor.connect( - 'changed', Lang.bind(this, this._statusChanged) - ); - } + this._lockMonitor = Gio.File.new_for_path( + lockFilePath).monitor_file(Gio.FileMonitorFlags.NONE, null + ); + this._lockMonitor.id = this._lockMonitor.connect( + 'changed', Lang.bind(this, this._statusChanged) + ); }, _detectLabel: function() { @@ -95,8 +93,7 @@ const BumblebeeNvidiaUtil = new Lang.Class({ destroy: function(){ this.parent(); - if(this._lockMonitor) - this._lockMonitor.disconnect(this._lockMonitor.id); + this._lockMonitor.disconnect(this._lockMonitor.id); } });