weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid crash with incompatible save on startup

Browse Source
This commit is contained in:
Raffson 2024-03-17 01:24:27 +01:00
parent c4bc515e19
commit cbaf509375
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
qt_ui/windows/QLiberationWindow.py
View File

@ -108,7 +108,7 @@ class QLiberationWindow(QMainWindow):
if last_save_file: if last_save_file:
logging.info("Loading last saved game : " + str(last_save_file)) logging.info("Loading last saved game : " + str(last_save_file))
game = persistency.load_game(last_save_file) game = persistency.load_game(last_save_file)
self.migrate_game(game, last_save_file) game = self.migrate_game(game, last_save_file)
self.onGameGenerated(game) self.onGameGenerated(game)
self.updateWindowTitle(last_save_file if game else None) self.updateWindowTitle(last_save_file if game else None)
else: else:
@ -316,7 +316,7 @@ class QLiberationWindow(QMainWindow):
) )
if file is not None and file[0] != "": if file is not None and file[0] != "":
game = persistency.load_game(file[0]) game = persistency.load_game(file[0])
self.migrate_game(game, file[0]) game = self.migrate_game(game, file[0])
GameUpdateSignal.get_instance().game_loaded.emit(game) GameUpdateSignal.get_instance().game_loaded.emit(game)
self.updateWindowTitle(file[0]) self.updateWindowTitle(file[0])
@ -324,15 +324,23 @@ class QLiberationWindow(QMainWindow):
def migrate_game(self, game, path): def migrate_game(self, game, path):
if game: if game:
is_liberation = ".liberation" in path is_liberation = ".liberation" in path
Migrator(game, is_liberation) try:
Migrator(game, is_liberation)
return game
except Exception:
self.incompatible_save_popup(path)
else: else:
relative_path = Path(path) self.incompatible_save_popup(path)
QMessageBox.critical( return None
self,
"Incompatible save", def incompatible_save_popup(self, path):
"Incompatible save file detected, please report the issue on GitHub or Discord.\n" relative_path = Path(path)
f"Make sure to include the campaign that fails to load, i.e.:\n\n{relative_path}", QMessageBox.critical(
) self,
"Incompatible save",
"Incompatible save file detected, please report the issue on GitHub or Discord.\n"
f"Make sure to include the campaign that fails to load, i.e.:\n\n{relative_path}",
)
def saveGame(self): def saveGame(self):
logging.info("Saving game") logging.info("Saving game")