summaryrefslogtreecommitdiffstatshomepage
path: root/src/frontend/mame/ui/menu.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/frontend/mame/ui/menu.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/frontend/mame/ui/menu.cpp')
-rw-r--r--src/frontend/mame/ui/menu.cpp16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/frontend/mame/ui/menu.cpp b/src/frontend/mame/ui/menu.cpp
index eecaab68978..3a0eff12c5e 100644
--- a/src/frontend/mame/ui/menu.cpp
+++ b/src/frontend/mame/ui/menu.cpp
@@ -31,7 +31,6 @@
namespace ui {
-
/***************************************************************************
CONSTANTS
***************************************************************************/
@@ -86,14 +85,14 @@ menu::global_state::global_state(running_machine &machine, ui_options const &opt
, m_machine(machine)
, m_cleanup_callbacks()
, m_bgrnd_bitmap()
- , m_bgrnd_texture(nullptr, machine.render())
, m_stack()
, m_free()
{
render_manager &render(machine.render());
+ auto const texture_free([&render](render_texture *texture) { render.texture_free(texture); });
// create a texture for main menu background
- m_bgrnd_texture.reset(render.texture_alloc(render_texture::hq_scale));
+ m_bgrnd_texture = texture_ptr(render.texture_alloc(render_texture::hq_scale), texture_free);
if (options.use_background_image() && (&machine.system() == &GAME_NAME(___empty)))
{
m_bgrnd_bitmap = std::make_unique<bitmap_argb32>(0, 0);
@@ -162,17 +161,8 @@ void menu::global_state::stack_reset()
void menu::global_state::clear_free_list()
{
- // free stack is in reverse order - unwind it properly
- std::unique_ptr<menu> reversed;
while (m_free)
- {
- std::unique_ptr<menu> menu(std::move(m_free));
- m_free = std::move(menu->m_parent);
- menu->m_parent = std::move(reversed);
- reversed = std::move(menu);
- }
- while (reversed)
- reversed = std::move(reversed->m_parent);
+ m_free = std::move(m_free->m_parent);
}