From 5e17cd1109f9705925742254fcc2be083603be39 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 20 Mar 2013 13:37:46 +0100 Subject: Transform actual station when loving/banning songs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Loving/banning a song from a shared station while playing quickmix resulted in “call not allowed”, because we tried to transform the quickmix instead of the song’s real station. Fixes #354. --- src/ui_act.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/ui_act.c') diff --git a/src/ui_act.c b/src/ui_act.c index 8d9ac09..33d9edb 100644 --- a/src/ui_act.c +++ b/src/ui_act.c @@ -122,11 +122,18 @@ BarUiActCallback(BarUiActAddMusic) { BarUiActCallback(BarUiActBanSong) { PianoReturn_t pRet; WaitressReturn_t wRet; + PianoStation_t *realStation; assert (selStation != NULL); assert (selSong != NULL); + assert (selSong->stationId != NULL); - if (!BarTransformIfShared (app, selStation)) { + if ((realStation = PianoFindStationById (app->ph.stations, + selSong->stationId)) == NULL) { + assert (0); + return; + } + if (!BarTransformIfShared (app, realStation)) { return; } @@ -312,11 +319,18 @@ BarUiActCallback(BarUiActDebug) { BarUiActCallback(BarUiActLoveSong) { PianoReturn_t pRet; WaitressReturn_t wRet; + PianoStation_t *realStation; assert (selStation != NULL); assert (selSong != NULL); + assert (selSong->stationId != NULL); - if (!BarTransformIfShared (app, selStation)) { + if ((realStation = PianoFindStationById (app->ph.stations, + selSong->stationId)) == NULL) { + assert (0); + return; + } + if (!BarTransformIfShared (app, realStation)) { return; } -- cgit v1.2.3