Merge pull request #36380 from davidpwbrown/hide_menu_fix

Refresh main menu windows after drawing
CleverRaven · Dec 23, 2019 · a6e6d77 · a6e6d77
2 parents f7cb595 + 4c0caad
commit a6e6d77
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/options.cpp b/src/options.cpp
@@ -2691,6 +2691,7 @@ std::string options_manager::show( bool ingame, const bool world_options_only )
             // keybinding screen erased the internal borders of main menu, restore it:
             draw_borders_internal( w_options_header, mapLines );
         } else if( action == "QUIT" ) {
+            catacurses::clear();
             catacurses::refresh();
             break;
         }

diff --git a/src/worldfactory.cpp b/src/worldfactory.cpp
@@ -486,6 +486,7 @@ WORLDPTR worldfactory::pick_world( bool show_prompt )
         const std::string action = ctxt.handle_input();
 
         if( action == "QUIT" ) {
+            catacurses::clear();
             catacurses::refresh();
             break;
         } else if( !world_pages[selpage].empty() && action == "DOWN" ) {
@@ -757,6 +758,7 @@ void worldfactory::show_active_world_mods( const std::vector<mod_id> &world_mods
             }
 
         } else if( action == "QUIT" || action == "CONFIRM" ) {
+            catacurses::clear();
             catacurses::refresh();
             break;
         }
@@ -1164,13 +1166,15 @@ int worldfactory::show_worldgen_tab_confirm( const catacurses::window &win, WORL
                     if( !valid_worldname( world->world_name ) ) {
                         continue;
                     }
+                    catacurses::clear();
                     catacurses::refresh();
                     return 1;
                 }
             } else if( query_yn( _( "Are you SURE you're finished?" ) ) ) {
                 // erase entire window to avoid overlapping of query with possible popup about invalid worldname
                 werase( w_confirmation );
                 wrefresh( w_confirmation );
+                catacurses::clear();
                 catacurses::refresh();
 
                 if( valid_worldname( worldname ) ) {