autosave fix

Odizinne · Feb 22, 2025 · 0f88d84 · 0f88d84
1 parent db885d4
commit 0f88d84
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/qml/Cell.qml b/qml/Cell.qml
@@ -36,7 +36,7 @@ Item {
         diagonalSum = row + col
 
         grid.cellsCreated++
-        if (grid.cellsCreated === GameState.gridSizeX * GameState.gridSizeY) {
+        if (grid.cellsCreated === GameState.gridSizeX * GameState.gridSizeY && !GameState.gridFullyInitialized) {
             GameState.gridFullyInitialized = true
             cellItem.root.startInitialLoadTimer()
         }

diff --git a/qml/GameState.qml b/qml/GameState.qml
@@ -14,6 +14,7 @@ QtObject {
     property var mines: []
     property var numbers: []
     property int cellSize: getCellSize()
+    property bool bypassAutoSave: false
 
     function getCellSize() {
         const size = GameSettings.cellSize

diff --git a/qml/Main.qml b/qml/Main.qml
@@ -17,7 +17,7 @@ ApplicationWindow {
             return
         }
 
-        if (GameSettings.loadLastGame && GameState.gameStarted && !GameState.gameOver) {
+        if (GameSettings.loadLastGame && GameState.gameStarted && !GameState.gameOver && !GameState.bypassAutoSave) {
             close.accepted = false
             if (!isSaving) {
                 isClosing = true
@@ -51,6 +51,7 @@ ApplicationWindow {
 
     Connections {
         target: GameCore
+        enabled: !SaveManager.manualSave
         function onSaveCompleted(success) {
             root.isSaving = false
             Qt.quit()
@@ -261,21 +262,16 @@ ApplicationWindow {
     function checkInitialGameState() {
         if (!GameState.gridFullyInitialized) return
 
-        if (!GameCore.showWelcome) {
-            let internalSaveData = GameCore.loadGameState("internalGameState.json")
-            if (internalSaveData) {
-                if (SaveManager.loadGame(internalSaveData)) {
-                    GameCore.deleteSaveFile("internalGameState.json")
-                    GameState.isManuallyLoaded = false
-                } else {
-                    console.error("Failed to load internal game state")
-                    grid.initGame()
-                }
+        let internalSaveData = GameCore.loadGameState("internalGameState.json")
+        if (internalSaveData) {
+            if (SaveManager.loadGame(internalSaveData)) {
+                GameCore.deleteSaveFile("internalGameState.json")
+                GameState.isManuallyLoaded = false
             } else {
+                console.error("Failed to load internal game state")
                 grid.initGame()
             }
         } else {
-            GameCore.deleteSaveFile("internalGameState.json")
             grid.initGame()
         }
 

diff --git a/qml/SaveManager.qml b/qml/SaveManager.qml
@@ -5,6 +5,7 @@ import net.odizinne.retr0mine 1.0
 Item {
     id: saveManager
     property var grid: null
+    property var manualSave: false
 
     function setGrid(gridReference) {
         grid = gridReference
@@ -165,6 +166,8 @@ Item {
             if (cell.safeQuestioned) saveData.gameState.safeQuestionedCells.push(i)
         }
 
+        console.log("pass")
         GameCore.saveGameState(JSON.stringify(saveData), filename)
+        SaveManager.manualSave = false
     }
 }
diff --git a/qml/SaveWindow.qml b/qml/SaveWindow.qml
@@ -85,6 +85,7 @@ Popup {
                 enabled: false
                 onClicked: {
                     if (saveNameField.text.trim()) {
+                        SaveManager.manualSave = true
                         SaveManager.saveGame(saveNameField.text.trim() + ".json")
                         control.visible = false
                     }

diff --git a/qml/SettingsPage.qml b/qml/SettingsPage.qml
@@ -82,6 +82,7 @@ ApplicationWindow {
                     Layout.preferredWidth: restoreDefaultsPopup.buttonWidth
                     Layout.fillWidth: true
                     onClicked: {
+                        GameState.bypassAutoSave = true
                         GameCore.resetRetr0Mine()
                     }
                 }
@@ -1013,6 +1014,7 @@ ApplicationWindow {
                                     if (GameState.gameStarted && !GameState.gameOver) {
                                         SaveManager.saveGame("internalGameState.json")
                                     }
+                                    GameState.bypassAutoSave = true
                                     GameCore.restartRetr0Mine(currentIndex)
                                 }
                             }