[Jrisk-cvs] SF.net SVN: domination-code:[2594] Domination

[<yu...@us...>]

Revision: 2594
          http://sourceforge.net/p/domination/code/2594
Author:   yuranet
Date:     2024-12-07 17:32:58 +0000 (Sat, 07 Dec 2024)
Log Message:
-----------
check game frame is showing when calling startGame again

Modified Paths:
--------------
    Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java
    Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameWindow.java
    Domination/src/net/yura/domination/engine/RiskUtil.java

Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java	2024-12-07 17:13:47 UTC (rev 2593)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java	2024-12-07 17:32:58 UTC (rev 2594)
@@ -683,6 +683,7 @@
                     final File autoSaveFile = DominationMain.getAutoSaveFile();
                     final File tempSaveFile = new File(autoSaveFile.getParent(), autoSaveFile.getName() + ".part");
 
+                    // WARNING! we may be in the middle of a large annihilation battle, with both sides rolling dice
                     risk.parserAndWait("savegame " + DominationMain.getAutoSaveFile() + ".part");
                     // if we may have closed the game while also closing the activity
                     // the save probably failed, and the rename will fail for sure.

Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameWindow.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameWindow.java	2024-12-07 17:13:47 UTC (rev 2593)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameWindow.java	2024-12-07 17:32:58 UTC (rev 2594)
@@ -414,7 +414,10 @@
                     RiskUtil.streamOpener.getMap(mapFile, new Observer() {
                         public void update(Observable o, Object arg) {
                             if (arg == RiskUtil.SUCCESS) {
-                                startGame(localGame);
+                                // user may have closed game as they got tired of waiting, then do nothing
+                                if (myrisk.getGame() == null) {
+                                    startGame(localGame);
+                                }
                             }
                             else {
                                 OptionPane.showMessageDialog(null, "error downloading map", null, OptionPane.ERROR_MESSAGE);

Modified: Domination/src/net/yura/domination/engine/RiskUtil.java
===================================================================
--- Domination/src/net/yura/domination/engine/RiskUtil.java	2024-12-07 17:13:47 UTC (rev 2593)
+++ Domination/src/net/yura/domination/engine/RiskUtil.java	2024-12-07 17:32:58 UTC (rev 2594)
@@ -297,7 +297,7 @@
                         }
                 }
                 catch (RuntimeException ex) {
-                    System.err.println("Error trying to load: " + fileName);
+                    System.out.println("Error trying to load: " + fileName);
                     throw ex;
                 }
                 finally {