From bbac2bf8c92cd8777d4ebbf34515956b64a5cddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Meyer?= Date: Mon, 16 Dec 2019 04:17:27 +0100 Subject: [PATCH] Fix crash at startup while loading a playlist The crash occurs in parole_player_toggle_playlist_action_cb(), which tries to access the parole_player global variable before it is affected a non-NULL pointer in parole_player_new(). Setting the parole_player global in parole_player_init() instead of parole_player_new() fixes the issue. --- src/parole-player.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/parole-player.c b/src/parole-player.c index ec14096..56be0b1 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -3125,6 +3125,7 @@ parole_player_init(ParolePlayer *player) { gint volume; + parole_player = player; g_setenv("PULSE_PROP_media.role", "video", TRUE); player->priv = parole_player_get_instance_private(player); @@ -3736,7 +3737,7 @@ parole_player_init(ParolePlayer *player) { ParolePlayer * parole_player_new(const gchar *client_id) { - parole_player = g_object_new(PAROLE_TYPE_PLAYER, "client-id", client_id, NULL); + g_object_new(PAROLE_TYPE_PLAYER, "client-id", client_id, NULL); return parole_player; } -- 2.21.0