From 8c3aacc8a64d2b1edec3263696b0a4fb4e8fe94a Mon Sep 17 00:00:00 2001 From: "fix94.1" Date: Thu, 16 Feb 2012 19:19:45 +0000 Subject: [PATCH] -fixed returning to global options if pressed b in cover download settings instead of cover menu --- source/menu/menu_download.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/source/menu/menu_download.cpp b/source/menu/menu_download.cpp index 29694ec4..daa85804 100644 --- a/source/menu/menu_download.cpp +++ b/source/menu/menu_download.cpp @@ -38,6 +38,7 @@ static const char FMT_CBPIC_URL[] = "http://art.gametdb.com/wii/coverfullHQ2/{lo static const char FMT_CPIC_URL[] = "http://art.gametdb.com/wii/cover2/{loc}/{gameid}.png"; static block download = { 0, 0 }; +static bool settingsmenu = false; static string countryCode(const string &gameId) { switch (gameId[3]) @@ -1192,7 +1193,16 @@ void CMenu::_download(string gameId) { _mainLoopCommon(false, m_thrdWorking); if ((BTN_HOME_PRESSED || BTN_B_PRESSED) && !m_thrdWorking) - break; + { + if(settingsmenu) + { + settingsmenu = false; + _hideSettings(); + _showDownload(); + } + else + break; + } else if (BTN_UP_PRESSED) m_btnMgr.up(); else if (BTN_DOWN_PRESSED) @@ -1320,11 +1330,13 @@ void CMenu::_download(string gameId) _showSettings(); } else if (m_btnMgr.selected(m_downloadBtnCoverSet) && !m_thrdWorking) - { + { + settingsmenu = true; _showSettings(); } else if (m_btnMgr.selected(m_downloadBtnBack) && !m_thrdWorking) - { + { + _hideSettings(); _showDownload(); } else if ((m_btnMgr.selected(m_downloadBtnEN) || m_btnMgr.selected(m_downloadBtnENs)) && !m_thrdWorking)