Don't swap loading screen

CleverRaven · Sep 13, 2024 · 91b7708 · 91b7708
1 parent d79a807
commit 91b7708
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/loading_ui.cpp b/src/loading_ui.cpp
@@ -93,9 +93,10 @@ static void update_state( const std::string &context, const std::string &step )
         } );
 
 #ifdef TILES
+        static cata_path current_img;
         std::vector<cata_path> imgs;
         std::vector<mod_id> &active_mod_list = world_generator->active_world->active_mod_order;
-        for( auto &some_mod : active_mod_list ) {
+        for( mod_id &some_mod : active_mod_list ) {
             const MOD_INFORMATION &mod = *some_mod;
             for( std::string img_name : mod.loading_images ) {
                 // There may be more than one file matching the name, so we need to get all of them
@@ -107,8 +108,11 @@ static void update_state( const std::string &context, const std::string &step )
         if( gLUI->chosen_load_img == cata_path() ) {
             if( imgs.empty() ) {
                 gLUI->chosen_load_img = PATH_INFO::gfxdir() / "cdda.png"; //default load screen
-            } else {
+            } else if( !std::count( imgs.begin(), imgs.end(), gLUI->chosen_load_img ) ) {
+                current_img = cata_path();
                 gLUI->chosen_load_img = random_entry( imgs );
+            } else {
+                gLUI->chosen_load_img = current_img;
             }
         }
         SDL_Surface_Ptr surf = load_image( gLUI->chosen_load_img.get_unrelative_path().u8string().c_str() );