Fix for NPE on exit with no connection

Fixed logic error and updated changelog for bug fix release 1.10.3.
RPTools · Oct 19, 2021 · 9f0b20e · 9f0b20e
1 parent 311ce6f
commit 9f0b20e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/CHANGE_LOG.md b/CHANGE_LOG.md
@@ -1,4 +1,9 @@
+# MapTool 1.10.3
+## Bug Fixes
+- [#3074][i3074] Fix NPE crash on exit when connection hasn't been established.
+
 # MapTool 1.10.2
+## Bug Fixes
 - [#3037][i3037] Fix webp images for getTokenImage(), tblImg() etc..
 
 
@@ -11,9 +16,6 @@
 - Translation updates
 
 
-
-
-
 # MapTool 1.10.0
 
 
@@ -86,6 +88,7 @@ Feature release using OpenJDK 16.
 
 [Change Log for 1.9.3](https://github.com/RPTools/maptool/blob/1.9.3/CHANGE_LOG.md)
 
+[i3074]: https://github.com/RPTools/maptool/issues/3074
 [i3025]: https://github.com/RPTools/maptool/issues/3025
 [i3023]: https://github.com/RPTools/maptool/issues/3023
 [i3017]: https://github.com/RPTools/maptool/issues/3017

diff --git a/src/main/java/net/rptools/maptool/client/MapTool.java b/src/main/java/net/rptools/maptool/client/MapTool.java
@@ -1265,7 +1265,7 @@ public static void disconnect() {
     }
 
     try {
-      if (conn != null || conn.isAlive()) {
+      if (conn != null && conn.isAlive()) {
         conn.close();
       }
     } catch (IOException ioe) {