diff options
author | 2016-03-02 21:49:49 +0100 | |
---|---|---|
committer | 2016-03-02 21:49:49 +0100 | |
commit | 9fe9f6d93e672bcd926f9e7461774bc9cc22e094 (patch) | |
tree | 3911b611dd010a4108b90fb8b8c82116eec21117 /src/emu/ui/mainmenu.cpp | |
parent | dbdf21ee465acadf3e643d62d6bedfcc297ada85 (diff) | |
parent | 1914702e6fae052668df5b068a502bca57c9a3b0 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
# Resolved Conflicts:
# src/osd/modules/render/d3d/d3dhlsl.cpp
# src/osd/windows/winmain.cpp
Diffstat (limited to 'src/emu/ui/mainmenu.cpp')
-rw-r--r-- | src/emu/ui/mainmenu.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/ui/mainmenu.cpp b/src/emu/ui/mainmenu.cpp index caf531c41ef..66381a3df1f 100644 --- a/src/emu/ui/mainmenu.cpp +++ b/src/emu/ui/mainmenu.cpp @@ -138,14 +138,14 @@ void ui_menu_main::populate() item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); /* add favorite menu */ - if (!machine().favorite().isgame_favorite()) + if (!machine().favorite().isgame_favorite()) item_append(_("Add To Favorites"), nullptr, 0, (void *)ADD_FAVORITE); else item_append(_("Remove From Favorites"), nullptr, 0, (void *)REMOVE_FAVORITE); item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); -// item_append(_("Quit from Machine"), nullptr, 0, (void *)QUIT_GAME); +// item_append(_("Quit from Machine"), nullptr, 0, (void *)QUIT_GAME); /* add reset and exit menus */ item_append(_("Select New Machine"), nullptr, 0, (void *)SELECT_GAME); @@ -246,7 +246,7 @@ void ui_menu_main::handle() ui_menu::stack_push(global_alloc_clear<ui_simple_menu_select_game>(machine(), container, nullptr)); } else { ui_menu::stack_push(global_alloc_clear<ui_menu_select_game>(machine(), container, nullptr)); - } + } break; case BIOS_SELECTION: @@ -262,12 +262,12 @@ void ui_menu_main::handle() break; case ADD_FAVORITE: - machine().favorite().add_favorite_game(); + machine().favorite().add_favorite_game(); reset(UI_MENU_RESET_REMEMBER_POSITION); break; case REMOVE_FAVORITE: - machine().favorite().remove_favorite_game(); + machine().favorite().remove_favorite_game(); reset(UI_MENU_RESET_REMEMBER_POSITION); break; |