[Jrisk-cvs] SF.net SVN: domination-code:[2544] Domination/src/net/yura/domination/ engine

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

Revision: 2544
          http://sourceforge.net/p/domination/code/2544
Author:   yuranet
Date:     2024-06-03 21:14:50 +0000 (Mon, 03 Jun 2024)
Log Message:
-----------
close ai after games

Modified Paths:
--------------
    Domination/src/net/yura/domination/engine/Risk.java
    Domination/src/net/yura/domination/engine/ai/AbstractAI.java

Modified: Domination/src/net/yura/domination/engine/Risk.java
===================================================================
--- Domination/src/net/yura/domination/engine/Risk.java	2024-06-03 21:09:22 UTC (rev 2543)
+++ Domination/src/net/yura/domination/engine/Risk.java	2024-06-03 21:14:50 UTC (rev 2544)
@@ -2737,8 +2737,8 @@
                 // does not work from here
                 closeBattle();
                 controller.closeGame();
+                game = null;
                 ai.closeGame();
-                game = null;
             }
 
             // we want to do this last as this may take a long time

Modified: Domination/src/net/yura/domination/engine/ai/AbstractAI.java
===================================================================
--- Domination/src/net/yura/domination/engine/ai/AbstractAI.java	2024-06-03 21:09:22 UTC (rev 2543)
+++ Domination/src/net/yura/domination/engine/ai/AbstractAI.java	2024-06-03 21:14:50 UTC (rev 2544)
@@ -26,7 +26,9 @@
 
         if (game == null) {
             // game over, clear game
-            current.setGame(null);
+            if (current != null) {
+                current.setGame(null);
+            }
         }
         else {
             int mode = game.getGameMode();