Change screenshot bind to F12 and fix scroll wheel scrolling during g…

…ameplay closes #134
Drewol · Nov 16, 2018 · c682b20 · c682b20
1 parent 4ebc3be
commit c682b20
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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);