matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when overwriting a local save

Browse Source
This commit is contained in:
Tamás Bálint Misius 2023-06-24 07:13:43 +02:00
parent 5b708219c0
commit 90004242d6
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/game/GameController.cpp
View File

@ -1163,10 +1163,10 @@ void GameController::OpenLocalSaveWindow(bool asCurrent)
tempSave->SetFileName(gameModel->GetSaveFile()->GetName()); tempSave->SetFileName(gameModel->GetSaveFile()->GetName());
tempSave->SetDisplayName(gameModel->GetSaveFile()->GetDisplayName()); tempSave->SetDisplayName(gameModel->GetSaveFile()->GetDisplayName());
} }
tempSave->SetGameSave(std::move(gameSave));
if (!asCurrent || !gameModel->GetSaveFile()) if (!asCurrent || !gameModel->GetSaveFile())
{ {
tempSave->SetGameSave(std::move(gameSave));
new LocalSaveActivity(std::move(tempSave), [this](auto file) { new LocalSaveActivity(std::move(tempSave), [this](auto file) {
gameModel->SetSaveFile(std::move(file), gameView->ShiftBehaviour()); gameModel->SetSaveFile(std::move(file), gameView->ShiftBehaviour());
}); });
@ -1183,6 +1183,7 @@ void GameController::OpenLocalSaveWindow(bool asCurrent)
Platform::MakeDirectory(LOCAL_SAVE_DIR); Platform::MakeDirectory(LOCAL_SAVE_DIR);
auto [ fromNewerVersion, saveData ] = gameSave->Serialise(); auto [ fromNewerVersion, saveData ] = gameSave->Serialise();
tempSave->SetGameSave(std::move(gameSave));
gameModel->SetSaveFile(std::move(tempSave), gameView->ShiftBehaviour()); gameModel->SetSaveFile(std::move(tempSave), gameView->ShiftBehaviour());
(void)fromNewerVersion; (void)fromNewerVersion;
if (saveData.size() == 0) if (saveData.size() == 0)