From 3acbd0af9c48198313b35e3fd9f82d02670e6b0f Mon Sep 17 00:00:00 2001 From: Aloshi Date: Sat, 8 Dec 2012 12:55:54 -0600 Subject: [PATCH] Fixed a crash when opening the start menu. Fixed PAGEDOWN/PAGEUP not appearing in the input config GUI. Fixed PAGEDOWN/PAGEUP not properly updating detail data. --- changelog.txt | 5 +++++ src/components/GuiGameList.cpp | 4 ++-- src/components/GuiInputConfig.cpp | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changelog.txt b/changelog.txt index 76266743a..67b7d5ef2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +December 8, 2012 +-Fixed a segfault when opening the menu (related to sounds). Woops! +-Fixed PAGEDOWN/PAGEUP not appearing in the input config GUI. +-Fixed PAGEDOWN/PAGEUP not properly clearing/updating detail data. + November 19 -Added Arch Linux's DejaVuSeriff.ttf path to the list of fonts to check for. diff --git a/src/components/GuiGameList.cpp b/src/components/GuiGameList.cpp index 8e65dbcf2..26e5903bc 100644 --- a/src/components/GuiGameList.cpp +++ b/src/components/GuiGameList.cpp @@ -176,7 +176,7 @@ void GuiGameList::onInput(InputManager::InputButton button, bool keyDown) if(mDetailed) { - if(button == InputManager::UP || button == InputManager::DOWN) + if(button == InputManager::UP || button == InputManager::DOWN || button == InputManager::PAGEUP || button == InputManager::PAGEDOWN) { if(!keyDown) updateDetailData(); @@ -274,7 +274,7 @@ void GuiGameList::clearDetailData() void GuiGameList::onPause() { mList->stopScrolling(); - mTheme->getSound("menuOpenSound")->play(); + mTheme->getSound("menuOpen")->play(); InputManager::unregisterComponent(this); } diff --git a/src/components/GuiInputConfig.cpp b/src/components/GuiInputConfig.cpp index 24f8aaf11..61799e31f 100644 --- a/src/components/GuiInputConfig.cpp +++ b/src/components/GuiInputConfig.cpp @@ -5,7 +5,7 @@ std::string GuiInputConfig::sConfigPath = "./input.cfg"; std::string GuiInputConfig::sInputs[] = { "UNKNOWN", "UP", "DOWN", "LEFT", "RIGHT", "BUTTON1 (Accept)", "BUTTON2 (Back)", "START (Menu)", "SELECT (Jump-to-letter)", "PAGE UP", "PAGE DOWN" }; //must be same order as InputManager::InputButton enum; only add to the end to preserve backwards compatibility -int GuiInputConfig::sInputCount = 9; +int GuiInputConfig::sInputCount = 11; GuiInputConfig::GuiInputConfig() {