Made save menu async- in future can investigate adding a little saving icon

Author: Causeless

Source/Managers/ActivityMan.cpp

@@ -81,8 +81,9 @@ bool ActivityMan::ForceAbortSave() {
 #define HACK_MZ_COMPRESS_METHOD_DEFLATE 8
 
 bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
-	m_SaveGameTask.wait();
-	m_SaveGameTask = std::future<void>();
+	if (m_SaveGameTask.valid()) {
+		m_SaveGameTask.wait();
+	}
 
 	Scene* scene = g_SceneMan.GetScene();
 	GAScripted* activity = dynamic_cast<GAScripted*>(GetActivity());
@@ -258,8 +259,10 @@ bool ActivityMan::LoadAndLaunchGame(const std::string& fileName) {
 	unzFile zippedSaveFile = unzOpen(saveFilePath.c_str());
 	if (!zippedSaveFile) {
 		// Might be trying to open one we're already saving too, wait until we finish saving and try again
-		m_SaveGameTask.wait();
-		zippedSaveFile = unzOpen(saveFilePath.c_str());
+		if (m_SaveGameTask.valid()) {
+			m_SaveGameTask.wait();
+			zippedSaveFile = unzOpen(saveFilePath.c_str());
+		}
 
 		if (!zippedSaveFile) {
 			// Some other process is stopping us from loading, oh well

Source/Managers/ActivityMan.h

@@ -131,11 +131,15 @@ namespace RTE {
 		bool LoadAndLaunchGame(const std::string& fileName);
 
 		/// Waits for the task that saves the game to complete.
-		void WaitForSaveGameTask() const { m_SaveGameTask.wait(); }
+		void WaitForSaveGameTask() const {
+			if (m_SaveGameTask.valid()) {
+				m_SaveGameTask.wait();
+			}
+		}
 
 		/// Returns whether a save is currently in progress.
 		/// @return Whether or not a save is currently in progress.
-		bool IsCurrentlySaving() const { return m_SaveGameTask.wait_for(std::chrono::seconds(0)) == std::future_status::ready; }
+		bool IsCurrentlySaving() const { return m_SaveGameTask.valid() && m_SaveGameTask.wait_for(std::chrono::seconds(0)) != std::future_status::ready; }
 #pragma endregion
 
 #pragma region Activity Start Handling

Source/Menus/SaveLoadMenuGUI.cpp

@@ -74,12 +74,16 @@ SaveLoadMenuGUI::SaveLoadMenuGUI(AllegroScreen* guiScreen, GUIInputWrapper* guiI
 	m_ConfirmationButton = dynamic_cast<GUIButton*>(m_GUIControlManager->GetControl("ConfirmButton"));
 	m_CancelButton = dynamic_cast<GUIButton*>(m_GUIControlManager->GetControl("CancelButton"));
 
+	m_SaveGamesFetched = false;
+
 	SwitchToConfirmDialogMode(ConfirmDialogMode::None);
 }
 
 void SaveLoadMenuGUI::PopulateSaveGamesList() {
-	g_ActivityMan.WaitForSaveGameTask();
-	
+	if (g_ActivityMan.IsCurrentlySaving() || m_SaveGamesFetched) {
+		return;
+	}
+
 	m_SaveGames.clear();
 	m_SaveGameName->SetText("");
 
@@ -143,6 +147,7 @@ void SaveLoadMenuGUI::PopulateSaveGamesList() {
 	              });
 
 	UpdateSaveGamesGUIList();
+	m_SaveGamesFetched = true;
 }
 
 void SaveLoadMenuGUI::UpdateSaveGamesGUIList() {
@@ -209,7 +214,7 @@ void SaveLoadMenuGUI::CreateSave() {
 		g_GUISound.UserErrorSound()->Play();
 	}
 
-	PopulateSaveGamesList();
+	m_SaveGamesFetched = false;
 }
 
 void SaveLoadMenuGUI::DeleteSave() {
@@ -218,7 +223,7 @@ void SaveLoadMenuGUI::DeleteSave() {
 	std::filesystem::remove(saveFilePath);
 	g_GUISound.ConfirmSound()->Play();
 
-	PopulateSaveGamesList();
+	m_SaveGamesFetched = false;
 }
 
 void SaveLoadMenuGUI::UpdateButtonEnabledStates() {
@@ -271,6 +276,8 @@ void SaveLoadMenuGUI::SwitchToConfirmDialogMode(ConfirmDialogMode mode) {
 }
 
 bool SaveLoadMenuGUI::HandleInputEvents(PauseMenuGUI* pauseMenu) {
+	PopulateSaveGamesList();
+	
 	m_GUIControlManager->Update();
 
 	GUIEvent guiEvent;
@@ -324,7 +331,7 @@ bool SaveLoadMenuGUI::HandleInputEvents(PauseMenuGUI* pauseMenu) {
 }
 
 void SaveLoadMenuGUI::Refresh() {
-	PopulateSaveGamesList();
+	m_SaveGamesFetched = false;
 	UpdateButtonEnabledStates();
 }