1 files changed, 7 insertions, 5 deletions
diff --git a/src/ui_act.c b/src/ui_act.c
index bb0769b..ba7dd1c 100644
--- a/src/ui_act.c
+++ b/src/ui_act.c
@@ -391,12 +391,14 @@ void BarUiActRenameStation (BAR_KS_ARGS) {
 /*	play another station
  */
 void BarUiActSelectStation (BAR_KS_ARGS) {
-	BarUiDoSkipSong (player);
-	PianoDestroyPlaylist (*curSong);
-	*curSong = NULL;
-	*curStation = BarUiSelectStation (ph, "Select station: ", curFd);
-	if (*curStation != NULL) {
+	PianoStation_t *newStation = BarUiSelectStation (ph, "Select station: ",
+			curFd);
+	if (newStation != NULL) {
+		*curStation = newStation;
 		BarUiPrintStation ((*curStation));
+		BarUiDoSkipSong (player);
+		PianoDestroyPlaylist (*curSong);
+		*curSong = NULL;
 	}
 }