Skip to content

Commit 1c50d51

Browse files
committed
[email protected]: Move MprisManager setup after _showFixedElements.
_addPlayer requires that to be set up already, and in situations such as reloading the applet, the MprisManager may immediately have players that can be added. This isn't really exposed in normal use, since at session startup, no players are usually running yet.
1 parent b389ce8 commit 1c50d51

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

files/usr/share/cinnamon/applets/[email protected]/applet.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,20 +1004,6 @@ class CinnamonSoundApplet extends Applet.TextIconApplet {
10041004
this._playerItems = [];
10051005
this._activePlayer = null;
10061006

1007-
// Use shared MPRIS module for player discovery
1008-
this._mprisManager = MprisPlayerModule.getMprisPlayerManager();
1009-
this._playerAddedId = this._mprisManager.connect('player-added', (manager, mprisPlayer) => {
1010-
this._addPlayer(mprisPlayer);
1011-
});
1012-
this._playerRemovedId = this._mprisManager.connect('player-removed', (manager, busName, owner) => {
1013-
this._removePlayer(busName, owner);
1014-
});
1015-
1016-
// Add any players that already exist
1017-
for (let mprisPlayer of this._mprisManager.getPlayers()) {
1018-
this._addPlayer(mprisPlayer);
1019-
}
1020-
10211007
this._control = new Cvc.MixerControl({ name: 'Cinnamon Volume Control' });
10221008
this._control.connect('state-changed', (...args) => this._onControlStateChanged(...args));
10231009

@@ -1092,6 +1078,20 @@ class CinnamonSoundApplet extends Applet.TextIconApplet {
10921078
this._volumeControlShown = false;
10931079

10941080
this._showFixedElements();
1081+
1082+
// Use shared MPRIS module for player discovery.
1083+
this._mprisManager = MprisPlayerModule.getMprisPlayerManager();
1084+
this._playerAddedId = this._mprisManager.connect('player-added', (manager, mprisPlayer) => {
1085+
this._addPlayer(mprisPlayer);
1086+
});
1087+
this._playerRemovedId = this._mprisManager.connect('player-removed', (manager, busName, owner) => {
1088+
this._removePlayer(busName, owner);
1089+
});
1090+
1091+
for (let mprisPlayer of this._mprisManager.getPlayers()) {
1092+
this._addPlayer(mprisPlayer);
1093+
}
1094+
10951095
this.set_show_label_in_vertical_panels(false);
10961096
this.set_applet_label(this._applet_label.get_text());
10971097

0 commit comments

Comments
 (0)