Commit ffec5f63 by Sal

Merge branch 'master' into next

parents 3a95266e 0241b73d
......@@ -624,8 +624,7 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
// Tell game we got focus back, resume music if necessary
window_notinfocus = false;
if (!paused)
S_InitMusicVolume();
S_InitMusicVolume();
if (cv_gamesounds.value)
S_EnableSound();
......
......@@ -164,3 +164,7 @@ else
endif
LIBS+=-ldiscord-rpc
endif
ifndef MINGW64
LDFLAGS+=-Wl,--large-address-aware
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment