Show "Engine is down." in trouble instead of "Engine is loading..."

featurecat · Sep 26, 2020 · 9ed6b84 · 9ed6b84
1 parent 5571603
commit 9ed6b84
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/src/main/java/featurecat/lizzie/analysis/Leelaz.java b/src/main/java/featurecat/lizzie/analysis/Leelaz.java
@@ -81,6 +81,7 @@ public class Leelaz {
   private int currentEngineN = -1;
   private ScheduledExecutorService executor;
   private boolean isQuittingNormally = false;
+  private boolean isDown = false;
 
   // dynamic komi and opponent komi as reported by dynamic-komi version of leelaz
   private float dynamicKomi = Float.NaN;
@@ -138,6 +139,7 @@ public void startEngine() throws IOException {
     isLoaded = false;
     isKataGo = false;
     isQuittingNormally = false;
+    isDown = false;
     bestMoves = new ArrayList<>();
     Lizzie.board.getData().tryToClearBestMoves();
 
@@ -183,10 +185,8 @@ public void startEngine() throws IOException {
       String err = e.getLocalizedMessage();
       String message =
           String.format(
-              "Failed to start the engine.\n\nError: %s\nEngine command: %s",
-              (err == null) ? "(No message)" : err, engineCommand);
-      JOptionPane.showMessageDialog(
-          Lizzie.frame, message, "Lizzie - Error!", JOptionPane.ERROR_MESSAGE);
+              "Failed to start the engine.\n\nError: %s", (err == null) ? "(No message)" : err);
+      alertEngineDown(message);
       throw e;
     }
 
@@ -229,6 +229,13 @@ public void restartEngine() throws IOException {
     togglePonder();
   }
 
+  private void alertEngineDown(String message) {
+    isDown = true;
+    String displayedMessage = String.format("%s\n\nEngine command: %s", message, engineCommand);
+    JOptionPane.showMessageDialog(
+        Lizzie.frame, displayedMessage, "Lizzie - Error!", JOptionPane.ERROR_MESSAGE);
+  }
+
   public void normalQuit() {
     isQuittingNormally = true;
     sendCommand("quit");
@@ -469,12 +476,8 @@ private void read() {
       // this line will be reached when Leelaz shuts down
       System.out.println("Engine process ended.");
       if (!isQuittingNormally) {
-        String message =
-            String.format(
-                "Engine process ended unintentionally for some reason.\n\nEngine command: %s",
-                engineCommand);
-        JOptionPane.showMessageDialog(
-            Lizzie.frame, message, "Lizzie - Error!", JOptionPane.ERROR_MESSAGE);
+        alertEngineDown(
+            "Engine process ended unintentionally for some reason.\nYou may find more information in GTP console.");
       }
 
       shutdown();
@@ -952,6 +955,10 @@ public boolean isLoaded() {
     return isLoaded;
   }
 
+  public boolean isDown() {
+    return isDown;
+  }
+
   public boolean supportScoremean() {
     return isKataGo || supportScoremean;
   }

diff --git a/src/main/java/featurecat/lizzie/gui/LizzieFrame.java b/src/main/java/featurecat/lizzie/gui/LizzieFrame.java
@@ -667,7 +667,10 @@ public void paintMainPanel(Graphics g0) {
           }
         }
       } else if (Lizzie.config.showStatus) {
-        String loadingText = resourceBundle.getString("LizzieFrame.display.loading");
+        String loadingText =
+            (Lizzie.leelaz != null) && Lizzie.leelaz.isDown()
+                ? "Engine is down."
+                : resourceBundle.getString("LizzieFrame.display.loading");
         drawPonderingState(g, loadingText, loadingX, loadingY, loadingSize);
       }