From 8ffb2c7f45856a9a5e5d74e41b62b840016047ad Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 22 Mar 2015 18:49:20 +0000 Subject: [PATCH] Use newmenu_do2 for newmenu_doreorder --- similar/main/newmenu.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/similar/main/newmenu.cpp b/similar/main/newmenu.cpp index 13a91498f..72ed7f503 100644 --- a/similar/main/newmenu.cpp +++ b/similar/main/newmenu.cpp @@ -513,17 +513,7 @@ static int newmenu_save_selection_handler(newmenu *menu, const d_event &event, c // Basically the same as do2 but sets reorderitems flag for weapon priority menu a bit redundant to get lose of a global variable but oh well... void newmenu_doreorder( const char * title, const char * subtitle, uint_fast32_t nitems, newmenu_item * item) { - newmenu *menu; - window *wind; - menu = newmenu_do3( title, subtitle, nitems, item, newmenu_save_selection_handler, unused_newmenu_userdata, 0, NULL ); - if (!menu) - return; - wind = menu->wind; // avoid dereferencing a freed 'menu' - - // newmenu_do2 and simpler get their own event loop - // This is so the caller doesn't have to provide a callback that responds to EVENT_NEWMENU_SELECTED - while (window_exists(wind)) - event_process(); + newmenu_do2(title, subtitle, nitems, item, newmenu_save_selection_handler, unused_newmenu_userdata, 0, nullptr); } #ifdef NEWMENU_MOUSE