Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1397 from dankan1890/master

Browse Source 
Fixed remove favorites via "configure machine" menu. (nw)
This commit is contained in:
Vas Crabb 2016-09-14 00:47:14 +10:00 committed by GitHub
commit 161d153bf7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontend/mame/ui/miscmenu.cpp
View File

@ -681,6 +681,7 @@ menu_machine_configure::menu_machine_configure(mame_ui_manager &mui, render_cont
, x0(_x0) , x0(_x0)
, y0(_y0) , y0(_y0)
, m_curbios(0) , m_curbios(0)
, m_fav_reset(false)
{ {
// parse the INI file // parse the INI file
std::string error; std::string error;
@ -690,6 +691,8 @@ menu_machine_configure::menu_machine_configure(mame_ui_manager &mui, render_cont
menu_machine_configure::~menu_machine_configure() menu_machine_configure::~menu_machine_configure()
{ {
if (m_fav_reset && main_filters::actual == FILTER_FAVORITE)
reset_topmost(reset_options::SELECT_FIRST);
} }
//------------------------------------------------- //-------------------------------------------------
@ -724,9 +727,9 @@ void menu_machine_configure::handle()
mame_machine_manager::instance()->favorite().add_favorite_game(m_drv); mame_machine_manager::instance()->favorite().add_favorite_game(m_drv);
reset(reset_options::REMEMBER_POSITION); reset(reset_options::REMEMBER_POSITION);
break; break;
case DELFAV: case DELFAV:
mame_machine_manager::instance()->favorite().remove_favorite_game(); mame_machine_manager::instance()->favorite().remove_favorite_game();
m_fav_reset = true;
reset(reset_options::REMEMBER_POSITION); reset(reset_options::REMEMBER_POSITION);
break; break;
case CONTROLLER: case CONTROLLER:

1
src/frontend/mame/ui/miscmenu.h
View File

@ -165,6 +165,7 @@ private:
s_bios m_bios; s_bios m_bios;
std::size_t m_curbios; std::size_t m_curbios;
void setup_bios(); void setup_bios();
bool m_fav_reset;
}; };
//------------------------------------------------- //-------------------------------------------------