Skip to content

PlayerList: guard default_widget against null before MPRIS events #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 3 commits into from
Aug 24, 2026
Merged

PlayerList: guard default_widget against null before MPRIS events #330

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce2da6f
PlayerList: guard default_widget against null before MPRIS events
eltictacdicta Aug 8, 2026
69a3ba8
Address review: make default_widget nullable and simplify guard
eltictacdicta Aug 9, 2026
86fe8fa
Merge branch 'main' into fix/default-widget-null-guards
eltictacdicta Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/Widgets/PlayerList.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class Sound.Widgets.PlayerList : Granite.Bin {

private AppInfo? default_player;
private PlayerRow bluetooth_widget;
private PlayerRow default_widget;
private PlayerRow? default_widget;
private HashTable<string,PlayerRow> ifaces;
private Services.DBusImpl impl;

Expand Down Expand Up @@ -60,7 +60,8 @@ public class Sound.Widgets.PlayerList : Granite.Bin {

object_manager.media_player_status_changed.connect ((status, title, artist) => {
bluetooth_widget.update_play (status, title, artist);
if (status == "playing" && default_widget.client.player.playback_status == "Playing") {
if (status == "playing" && default_widget != null && default_widget.client != null
&& default_widget.client.player.playback_status == "Playing") {
try {
default_widget.client.player.play_pause ();
} catch (Error e) {
Expand Down Expand Up @@ -106,7 +107,8 @@ public class Sound.Widgets.PlayerList : Granite.Bin {
* @param iface The constructed MprisClient instance
*/
private void add_iface (string name, Services.MprisClient iface) {
if ((default_player != null) && (iface.player.desktop_entry == default_player.get_id ().replace (".desktop", ""))) {
if ((default_player != null) && default_widget != null
&& (iface.player.desktop_entry == default_player.get_id ().replace (".desktop", ""))) {
default_widget.mpris_name = name;
default_widget.client = iface;
ifaces.insert (name, default_widget);
Expand All @@ -132,7 +134,7 @@ public class Sound.Widgets.PlayerList : Granite.Bin {
* @param name DBUS name to remove handler for
*/
private void destroy_iface (string name) {
if (default_widget.mpris_name == name) {
if (default_widget != null && default_widget.mpris_name == name) {
default_widget.client = null;
} else {
var widg = ifaces[name];
Expand Down
Loading