Skip to content

Fix #361 playerctld crash when playlist interface unavailable #365

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

Open
crvs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #361 playerctld crash when playlist interface unavailable #365

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 8 additions & 13 deletions playerctl/playerctl-daemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,14 +488,6 @@ static void context_remove_player(struct PlayerctldContext *ctx, struct Player *
}
}

static void context_rotate_queue(struct PlayerctldContext *ctx) {
struct Player *player;
if ((player = g_queue_peek_head(ctx->players))) {
context_remove_player(ctx, player);
g_queue_push_tail(ctx->players, player);
}
}

static void context_unrotate_queue(struct PlayerctldContext *ctx) {
struct Player *player;
if ((player = g_queue_peek_tail(ctx->players))) {
Expand Down Expand Up @@ -906,11 +898,13 @@ static void on_bus_acquired(GDBusConnection *connection, const char *name, gpoin
g_clear_error(&error);
}

g_dbus_connection_register_object(connection, MPRIS_PATH, ctx->playlists_interface_info,
&vtable_mpris, user_data, NULL, &error);
if (error != NULL) {
g_warning("%s", error->message);
g_clear_error(&error);
if (ctx->playlists_interface_info != NULL) {
g_dbus_connection_register_object(connection, MPRIS_PATH, ctx->playlists_interface_info,
&vtable_mpris, user_data, NULL, &error);
if (error != NULL) {
g_warning("%s", error->message);
g_clear_error(&error);
}
}

g_dbus_connection_register_object(connection, MPRIS_PATH, ctx->tracklist_interface_info,
Expand Down Expand Up @@ -1490,6 +1484,7 @@ int main(int argc, char *argv[]) {
if (error != NULL) {
// This interface is optional, so we can keep the player around
player->playlists.supported = false;
ctx.playlists_interface_info = NULL;
g_warning("could not get playlists properties for player: %s", player->well_known);
g_clear_error(&error);
} else {
Expand Down