[gnome-shell] bluetooth: Fix showing menu when devices were set up
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] bluetooth: Fix showing menu when devices were set up
- Date: Tue, 7 Apr 2020 14:04:32 +0000 (UTC)
commit f4ba3e4ab8c8d524cb296bc329c1d07b84750a3c
Author: Florian Müllner <fmuellner gnome org>
Date: Fri Apr 3 14:34:21 2020 +0200
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 04a6d5ae29..0c43749fee 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]