summaryrefslogtreecommitdiffstats
path: root/src/frontend/mame/ui/floppycntrl.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2016-07-10 02:42:38 +1000
committer Vas Crabb <vas@vastheman.com>2016-07-10 03:01:13 +1000
commit1abf53ca6a7a01ae2d4491825a97b0a4baef634a (patch)
tree2a061c81dab912dbf52f8cdd54f97507820029dd /src/frontend/mame/ui/floppycntrl.cpp
parent2364b48f0dd496de3908fa4d3bcd24693a5f6231 (diff)
UI code refactoring: [Vas Crabb]
* Split out main menu and dat box drawing from base class * Make a bunch of class statics proper per-machine persistent objects * Object lifecycle fixes
Diffstat (limited to 'src/frontend/mame/ui/floppycntrl.cpp')
-rw-r--r--src/frontend/mame/ui/floppycntrl.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/frontend/mame/ui/floppycntrl.cpp b/src/frontend/mame/ui/floppycntrl.cpp
index 0fc1408f603..f47b4d580bf 100644
--- a/src/frontend/mame/ui/floppycntrl.cpp
+++ b/src/frontend/mame/ui/floppycntrl.cpp
@@ -67,7 +67,7 @@ void menu_control_floppy_image::hook_load(std::string filename, bool softlist)
{
machine().popmessage("When loaded from software list, the disk is Read-only.\n");
image->load(filename.c_str());
- menu::stack_pop(machine());
+ stack_pop();
return;
}
@@ -77,7 +77,7 @@ void menu_control_floppy_image::hook_load(std::string filename, bool softlist)
if (!input_format)
{
machine().popmessage("Error: %s\n", image->error());
- menu::stack_pop(machine());
+ stack_pop();
return;
}
@@ -134,7 +134,7 @@ void menu_control_floppy_image::handle()
output_filename = util::zippath_combine(m_current_directory.c_str(), m_current_file.c_str());
output_format = format_array[submenu_result.i];
do_load_create();
- menu::stack_pop(machine());
+ stack_pop();
}
break;
@@ -142,18 +142,18 @@ void menu_control_floppy_image::handle()
switch(submenu_result.rw) {
case menu_select_rw::result::READONLY:
do_load_create();
- menu::stack_pop(machine());
+ stack_pop();
break;
case menu_select_rw::result::READWRITE:
output_format = input_format;
do_load_create();
- menu::stack_pop(machine());
+ stack_pop();
break;
case menu_select_rw::result::WRITE_DIFF:
machine().popmessage("Sorry, diffs are not supported yet\n");
- menu::stack_pop(machine());
+ stack_pop();
break;
case menu_select_rw::result::WRITE_OTHER: