From 3399b775b7b51ab04a271bef3cae3d43ac0308cc Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 9 Jun 2015 18:14:15 +0200 Subject: command: fix audio-out-detected-device property Used a wrong condition, and I suppose it could crash in some situations. Change it to lazily initialize the hotplug stuff, like the audio-device-list property does. --- player/command.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'player/command.c') diff --git a/player/command.c b/player/command.c index 40ecd15916..7adb72902d 100644 --- a/player/command.c +++ b/player/command.c @@ -1610,8 +1610,9 @@ static int mp_property_ao_detected_device(void *ctx,struct m_property *prop, { struct MPContext *mpctx = ctx; struct command_ctx *cmd = mpctx->command_ctx; - if (!mpctx->ao) - return M_PROPERTY_UNAVAILABLE; + if (!cmd->hotplug) + cmd->hotplug = ao_hotplug_create(mpctx->global, mpctx->input); + const char *d = ao_hotplug_get_detected_device(cmd->hotplug); return m_property_strdup_ro(action, arg, d); } -- cgit v1.2.3