From f4ba3e4ab8c8d524cb296bc329c1d07b84750a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 3 Apr 2020 14:34:21 +0200 Subject: [PATCH] bluetooth: Fix showing menu when devices were set up Since commit 26c2cb9f65c, nDevices is always the actual number of paired/trusted devices. So when bluetooth is turned off, it is now 0 rather than forced to 1 if devices were set up previously. Fix this by checking the property that tracks set up devices instead. https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1174 --- js/ui/status/bluetooth.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js index 04a6d5ae2..0c43749fe 100644 --- a/js/ui/status/bluetooth.js +++ b/js/ui/status/bluetooth.js @@ -109,7 +109,6 @@ class Indicator extends PanelMenu.SystemIndicator { let devices = this._getDeviceInfos(adapter); const connectedDevices = devices.filter(dev => dev.connected); const nConnectedDevices = connectedDevices.length; - const nDevices = devices.length; let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter; @@ -118,7 +117,7 @@ class Indicator extends PanelMenu.SystemIndicator { // Remember if there were setup devices and show the menu // if we've seen setup devices and we're not hard blocked - if (nDevices > 0) + if (this._hadSetupDevices) this._item.visible = !this._proxy.BluetoothHardwareAirplaneMode; else this._item.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;