[vlc-commits] control: dbus: fix error path

Alexandre Janniaux git at videolan.org
Sat Apr 11 09:13:19 CEST 2020


vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Sat Apr  4 12:05:35 2020 +0200| [42b1ccbc6a2a8a6468453c6c98f609525d5996a3] | committer: Alexandre Janniaux

control: dbus: fix error path

The error path was shifted one label too soon, meaning that object that
couldn't be created got destroyed too.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=42b1ccbc6a2a8a6468453c6c98f609525d5996a3
---

 modules/control/dbus/dbus.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
index e55058a7c0..b497be4656 100644
--- a/modules/control/dbus/dbus.c
+++ b/modules/control/dbus/dbus.c
@@ -328,14 +328,14 @@ static int Open( vlc_object_t *p_this )
 
 late_failure:
     vlc_playlist_Lock(playlist);
-player_vout_listener_failure:
     vlc_player_vout_RemoveListener(player, p_sys->player_vout_listener);
-player_aout_listener_failure:
+player_vout_listener_failure:
     vlc_player_aout_RemoveListener(player, p_sys->player_aout_listener);
-player_listener_failure:
+player_aout_listener_failure:
     vlc_player_RemoveListener(player, p_sys->player_listener);
-playlist_listener_failure:
+player_listener_failure:
     vlc_playlist_RemoveListener(playlist, p_sys->playlist_listener);
+playlist_listener_failure:
     vlc_playlist_Unlock(playlist);
 
     var_Destroy(vlc, "dbus-mpris-name");



More information about the vlc-commits mailing list