3 files changed, 18 insertions, 6 deletions

diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index d10a4d0e..34eae77c 100644
--- a/src/audio/MusicManager.cpp
+++ b/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) {
diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index e2e87f2d..ed73e940 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -464,7 +464,7 @@ public:
 #endif
 
 #ifdef AUDIO_OAL_USE_MPG123
-// fuzzy seek eliminates stutter when playing ADF but spams errors a lot (nothing breaks though)
+// fuzzy seek eliminates stutter when playing ADF but spams errors a lot (and breaks radio sometimes)
 //#define MP3_USE_FUZZY_SEEK
 
 class CMP3File : public IDecoder
@@ -492,6 +492,8 @@ public:
 		{
 #ifdef MP3_USE_FUZZY_SEEK
 			mpg123_param(m_pMH, MPG123_FLAGS, MPG123_FUZZY | MPG123_SEEKBUFFER | MPG123_GAPLESS | MPG123_QUIET, 0.0);
+#else
+			mpg123_param(m_pMH, MPG123_FLAGS, MPG123_SEEKBUFFER | MPG123_GAPLESS, 0.0);
 #endif
 			long rate = 0;
 			int channels = 0;
@@ -602,6 +604,8 @@ public:
 		{
 #ifdef MP3_USE_FUZZY_SEEK
 			mpg123_param(m_pMH, MPG123_FLAGS, MPG123_FUZZY | MPG123_SEEKBUFFER | MPG123_GAPLESS | MPG123_QUIET, 0.0);
+#else
+			mpg123_param(m_pMH, MPG123_FLAGS, MPG123_SEEKBUFFER | MPG123_GAPLESS, 0.0);
 #endif
 			long rate = 0;
 			int channels = 0;
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index b4551ffc..e6419069 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -1881,8 +1881,13 @@ CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8
 		}
 
 		// Print bindings, including seperator (-) between them
+
 		CFont::SetScale(MENU_X(0.25f), MENU_Y(LISTITEM_Y_SCALE));
+#ifdef FIX_BUGS
+		for (; contSetOrder < MAX_SETORDERS && controllerAction >= 0; contSetOrder++) {
+#else
 		for (; contSetOrder < MAX_SETORDERS && controllerAction != -1; contSetOrder++) {
+#endif
 			wchar *settingText = ControlsManager.GetControllerSettingTextWithOrderNumber((e_ControllerAction)controllerAction, (eContSetOrder)contSetOrder);
 			if (settingText) {
 				++bindingsForThisOpt;
@@ -5503,6 +5508,9 @@ CMenuManager::SwitchMenuOnAndOff()
 				}
 				Initialise();
 				LoadAllTextures();
+#ifdef FIX_BUGS
+				CPad::StopPadsShaking();
+#endif
 			} else {
 #ifdef EXTENDED_COLOURFILTER
 				// we always expect CPostFX to be open