Merge tag 'release-0.17.4'

src/PlayerCommands.cxx

@@ -169,19 +169,23 @@ handle_status(Client *client,
 	}
 
 	if (player_status.state != PLAYER_STATE_STOP) {
-		struct audio_format_string af_string;
-
 		client_printf(client,
 			      COMMAND_STATUS_TIME ": %i:%i\n"
 			      "elapsed: %1.3f\n"
-			      COMMAND_STATUS_BITRATE ": %u\n"
-			      COMMAND_STATUS_AUDIO ": %s\n",
+			      COMMAND_STATUS_BITRATE ": %u\n",
 			      (int)(player_status.elapsed_time + 0.5),
 			      (int)(player_status.total_time + 0.5),
 			      player_status.elapsed_time,
-			      player_status.bit_rate,
-			      audio_format_to_string(&player_status.audio_format,
-						     &af_string));
+			      player_status.bit_rate);
+
+		if (audio_format_defined(&player_status.audio_format)) {
+			struct audio_format_string af_string;
+
+			client_printf(client,
+				      COMMAND_STATUS_AUDIO ": %s\n",
+				      audio_format_to_string(&player_status.audio_format,
+							     &af_string));
+		}
 	}
 
 	if ((updateJobId = isUpdatingDB())) {

src/PlayerControl.cxx

@@ -104,8 +104,6 @@ player_control::Play(struct song *song)
 	assert(next_song == nullptr);
 
 	Unlock();
-
-	idle_add(IDLE_PLAYER);
 }
 
 void

src/PlayerThread.cxx

@@ -335,6 +335,8 @@ player_open_output(struct player *player)
 		pc->state = PLAYER_STATE_PLAY;
 		pc->Unlock();
 
+		idle_add(IDLE_PLAYER);
+
 		return true;
 	} else {
 		g_warning("%s", error->message);
@@ -399,6 +401,8 @@ player_check_decoder_startup(struct player *player)
 		pc->audio_format = dc->in_audio_format;
 		pc->Unlock();
 
+		idle_add(IDLE_PLAYER);
+
 		player->play_audio_format = dc->out_audio_format;
 		player->decoder_starting = false;