From cc24a339d8c0517259084b5c178d784626ba965c Mon Sep 17 00:00:00 2001 From: ImJezze Date: Sun, 21 Feb 2016 11:48:45 +0100 Subject: Merge remote-tracking branch 'refs/remotes/mamedev/master' Second attempt --- src/devices/imagedev/floppy.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/devices/imagedev/floppy.cpp') diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index 2d6eb4d5460..cb7e184f811 100644 --- a/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp @@ -933,7 +933,7 @@ UINT32 floppy_image_device::get_variant() const ui_menu *floppy_image_device::get_selection_menu(running_machine &machine, render_container *container) { - return auto_alloc_clear(machine, (machine, container, this)); + return global_alloc_clear(machine, container, this); } ui_menu_control_floppy_image::ui_menu_control_floppy_image(running_machine &machine, render_container *container, device_image_interface *_image) : ui_menu_control_device_image(machine, container, _image) @@ -1010,7 +1010,7 @@ void ui_menu_control_floppy_image::hook_load(std::string filename, bool softlist can_in_place = false; } submenu_result = -1; - ui_menu::stack_push(auto_alloc_clear(machine(), (machine(), container, can_in_place, &submenu_result))); + ui_menu::stack_push(global_alloc_clear(machine(), container, can_in_place, &submenu_result)); state = SELECT_RW; } @@ -1036,7 +1036,7 @@ void ui_menu_control_floppy_image::handle() format_array[total_usable++] = i; } submenu_result = -1; - ui_menu::stack_push(auto_alloc_clear(machine(), (machine(), container, format_array, ext_match, total_usable, &submenu_result))); + ui_menu::stack_push(global_alloc_clear(machine(), container, format_array, ext_match, total_usable, &submenu_result)); state = SELECT_FORMAT; break; @@ -1073,7 +1073,7 @@ void ui_menu_control_floppy_image::handle() break; case ui_menu_select_rw::WRITE_OTHER: - ui_menu::stack_push(auto_alloc_clear(machine(), (machine(), container, image, current_directory, current_file, &create_ok))); + ui_menu::stack_push(global_alloc_clear(machine(), container, image, current_directory, current_file, &create_ok)); state = CHECK_CREATE; break; -- cgit v1.2.3-70-g09d2