bugfix: audio stuck muted after minimize

Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32GameEngine.cpp

@@ -85,8 +85,6 @@ void Win32GameEngine::reset()
 //-------------------------------------------------------------------------------------------------
 void Win32GameEngine::update()
 {
-
-
 	// call the engine normal update
 	GameEngine::update();
 
@@ -112,6 +110,12 @@ void Win32GameEngine::update()
 				break; // keep running.
 			}
 		}
+
+		// The MilesAudioManager seems to go into a coma sometimes when the window is minimized
+		// and not regain focus properly when we come back. We're going to force it to wake up after we come back from being minimized.
+		AudioAffect aa = (AudioAffect)0x10;  // AudioAffect_SystemSetting: forces m_volumeHasChanged without changing channel volumes
+		if (TheAudio)
+			TheAudio->setVolume(TheAudio->getVolume(aa), aa);
 	}
 
 	// allow windows to perform regular windows maintenance stuff like msgs

Generals/Code/Main/WinMain.cpp

@@ -451,6 +451,9 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 						//restore mouse cursor to our custom version.
 						if (TheWin32Mouse)
 							TheWin32Mouse->setCursor(TheWin32Mouse->getMouseCursor());
+
+						if (TheAudio)
+							TheAudio->unmuteAudio(AudioManager::MuteAudioReason_WindowFocus);
 					}
 				}
 				return 0;
@@ -468,12 +471,13 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				}
 				else
 				{
-					if (TheAudio)
-						TheAudio->unmuteAudio(AudioManager::MuteAudioReason_WindowFocus);
-
 					// Cursor can only be captured after one of the activation events.
 					if (TheMouse)
 						TheMouse->refreshCursorCapture();
+
+					// Unmute audio when the window is activated.
+					if (TheAudio)
+						TheAudio->unmuteAudio(AudioManager::MuteAudioReason_WindowFocus);
 				}
 				break;
 			}

GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32GameEngine.cpp

@@ -119,10 +119,10 @@ void Win32GameEngine::update()
 			}
 		}
 
-    // When we are alt-tabbed out... the MilesAudioManager seems to go into a coma sometimes
-    // and not regain focus properly when we come back. This seems to wake it up nicely.
-    AudioAffect aa = (AudioAffect)0x10;
-		TheAudio->setVolume(TheAudio->getVolume( aa ), aa );
+		// When we are alt-tabbed out... the MilesAudioManager seems to go into a coma sometimes
+		// and not regain focus properly when we come back. This seems to wake it up nicely.
+		AudioAffect aa = (AudioAffect)0x10;
+			TheAudio->setVolume(TheAudio->getVolume( aa ), aa );
 
 	}
 

GeneralsMD/Code/Main/WinMain.cpp

@@ -474,6 +474,10 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message,
 					//restore mouse cursor to our custom version.
 					if (TheWin32Mouse)
 						TheWin32Mouse->setCursor(TheWin32Mouse->getMouseCursor());
+
+					// Unmute audio when the window is activated.
+					if (TheAudio)
+						TheAudio->unmuteAudio(AudioManager::MuteAudioReason_WindowFocus);
 				}
 			}
 			return 0;