diff options
Diffstat (limited to 'src/frontend/mame/ui/filemngr.cpp')
-rw-r--r-- | src/frontend/mame/ui/filemngr.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/frontend/mame/ui/filemngr.cpp b/src/frontend/mame/ui/filemngr.cpp index 69a3b5ca5fa..1ef861e5475 100644 --- a/src/frontend/mame/ui/filemngr.cpp +++ b/src/frontend/mame/ui/filemngr.cpp @@ -12,17 +12,19 @@ *********************************************************************/ #include "emu.h" -#include "ui/ui.h" -#include "ui/menu.h" #include "ui/filemngr.h" + #include "ui/filesel.h" -#include "ui/miscmenu.h" -#include "ui/imgcntrl.h" #include "ui/floppycntrl.h" +#include "ui/imgcntrl.h" +#include "ui/miscmenu.h" +#include "ui/ui.h" + #include "softlist.h" namespace ui { + /*************************************************************************** FILE MANAGER ***************************************************************************/ @@ -168,7 +170,7 @@ void menu_file_manager::handle() { // process the menu const event *event = process(0); - if (event != nullptr && event->itemref != nullptr && event->iptkey == IPT_UI_SELECT) + if (event && event->itemref && (event->iptkey == IPT_UI_SELECT)) { if ((uintptr_t)event->itemref == 1) { @@ -177,18 +179,15 @@ void menu_file_manager::handle() else { selected_device = (device_image_interface *) event->itemref; - if (selected_device != nullptr) + if (selected_device) { m_curr_selected = true; floppy_image_device *floppy_device = dynamic_cast<floppy_image_device *>(selected_device); - if (floppy_device != nullptr) - { + if (floppy_device) menu::stack_push<menu_control_floppy_image>(ui(), container(), *floppy_device); - } else - { menu::stack_push<menu_control_device_image>(ui(), container(), *selected_device); - } + // reset the existing menu reset(reset_options::REMEMBER_POSITION); } |