Removed redundant calls to game_launcher::clear_loaded_game

Calling game_launcher::load_game already cleared the loaded data if present unconditionally.
wesnoth · Jan 5, 2021 · 5242fa3 · 5242fa3
1 parent d9680a9
commit 5242fa3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/gui/dialogs/title_screen.cpp b/src/gui/dialogs/title_screen.cpp
@@ -340,8 +340,6 @@ void title_screen::pre_show(window& win)
 	register_button(win, "load", hotkey::HOTKEY_LOAD_GAME, [this, &win]() {
 		if(game_.load_game()) {
 			win.set_retval(LAUNCH_GAME);
-		} else {
-			game_.clear_loaded_game();
 		}
 	});
 

diff --git a/src/wesnoth.cpp b/src/wesnoth.cpp
@@ -884,10 +884,7 @@ static int do_gameloop(const std::vector<std::string>& args)
 
 		// If loading a game, skip the titlescreen entirely
 		if(game->is_loading()) {
-			if(!game->load_game()) {
-				game->clear_loaded_game();
-			}
-
+			game->load_game();
 			game->launch_game(should_reload);
 			continue;
 		}