Merge remote-tracking branch 'origin/miami' into lcs

src/audio/MusicManager.cpp

@@ -1265,7 +1265,11 @@ cMusicManager::DisplayRadioStationName()
 
 		if (vehicle)
 		{
-			int8 track;
+#if defined RADIO_SCROLL_TO_PREV_STATION || defined FIX_BUGS // Because m_nFrontendTrack can have NO_TRACK
+			int track;
+#else
+			uint8 track;
+#endif
 			gStreamedSound = vehicle->m_nRadioStation;
 			if (gStreamedSound >= STREAMED_SOUND_CITY_AMBIENT && gStreamedSound <= STREAMED_SOUND_AMBSIL_AMBIENT)
 				gStreamedSound = RADIO_OFF;
@@ -1282,11 +1286,7 @@ cMusicManager::DisplayRadioStationName()
 					gNumRetunePresses++;
 			}
 			else
-#ifdef FIX_BUGS
-				track = GetCarTuning(); // gStreamedSound or veh->m_nRadioStation would also work, but these don't cover police/taxi radios
-#else
 				track = m_nFrontendTrack;
-#endif
 
 			wchar* string = nil;
 			switch (track) {