From 60de35ddf39c3ff758a9ebfb24721b9c9c648d37 Mon Sep 17 00:00:00 2001 From: Raffson Date: Sat, 25 Feb 2023 17:50:53 +0100 Subject: [PATCH] Re-create game-loop in case of abort Fixes #96 --- qt_ui/windows/QWaitingForMissionResultWindow.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qt_ui/windows/QWaitingForMissionResultWindow.py b/qt_ui/windows/QWaitingForMissionResultWindow.py index 86616598..628c6ac7 100644 --- a/qt_ui/windows/QWaitingForMissionResultWindow.py +++ b/qt_ui/windows/QWaitingForMissionResultWindow.py @@ -112,7 +112,7 @@ class QWaitingForMissionResultWindow(QDialog): self.manually_submit.clicked.connect(self.submit_manually) self.actions_layout.addWidget(self.manually_submit) self.cancel = QPushButton("Abort mission") - self.cancel.clicked.connect(self.close) + self.cancel.clicked.connect(self.reset_game_state) self.actions_layout.addWidget(self.cancel) self.gridLayout.addWidget(self.actions, 2, 0) @@ -123,7 +123,7 @@ class QWaitingForMissionResultWindow(QDialog): self.manually_submit2.clicked.connect(self.submit_manually) self.actions2_layout.addWidget(self.manually_submit2) self.cancel2 = QPushButton("Abort mission") - self.cancel2.clicked.connect(self.close) + self.cancel2.clicked.connect(self.reset_game_state) self.actions2_layout.addWidget(self.cancel2) self.proceed = QPushButton("Accept results") self.proceed.setProperty("style", "btn-success") @@ -236,3 +236,8 @@ class QWaitingForMissionResultWindow(QDialog): self.on_debriefing_update( self.sim_controller.debrief_current_state(Path(file[0]), force_end=True) ) + + def reset_game_state(self): + self.sim_controller.set_game(self.game) + GameUpdateSignal.get_instance().updateGame(self.game) + self.close()