diff --git a/.gitignore b/.gitignore index b8b537742..889fab58e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,8 @@ bin/songs/* maps.db bin/Main.cfg +bin/screenshots +bin/log* # Intermediate Files x64 @@ -48,6 +50,3 @@ Makefile # Document build files docs/build - -# Game screenshot folder -bin/screenshots diff --git a/Main/ScoreScreen.cpp b/Main/ScoreScreen.cpp index cc48cd461..2694b5109 100644 --- a/Main/ScoreScreen.cpp +++ b/Main/ScoreScreen.cpp @@ -251,7 +251,7 @@ class ScoreScreen_Impl : public ScoreScreen { g_application->RemoveTickable(this); } - if (key == SDLK_PRINTSCREEN) + if (key == SDLK_F12) { auto luaPopInt = [this] { diff --git a/Main/SongSelect.cpp b/Main/SongSelect.cpp index b2f27a15e..6f131610d 100644 --- a/Main/SongSelect.cpp +++ b/Main/SongSelect.cpp @@ -1234,6 +1234,9 @@ class SongSelect_Impl : public SongSelect } void m_OnMouseScroll(int32 steps) { + if (m_suspended) + return; + if (m_settingsWheel->Active) { m_settingsWheel->AdvanceSelection(steps);