Merge pull request #3354 from Phergus/protobufMigrationFixes3254

Misc fixes for protobuf migration
RPTools · Jan 26, 2022 · cea4ee0 · cea4ee0
2 parents c7059bd + 343f300
commit cea4ee0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/AppActions.java b/src/main/java/net/rptools/maptool/client/AppActions.java
@@ -2666,7 +2666,7 @@ protected void done() {
         if (t.getCause() instanceof AppState.FailedToAcquireLockException) {
           MapTool.showError("msg.error.failedLoadCampaignLock");
         } else {
-          MapTool.showError("msg.error.failedLoadCampaign", t.getCause());
+          MapTool.showError("msg.error.failedLoadCampaign", t);
         }
       }
     }

diff --git a/src/main/java/net/rptools/maptool/client/MapTool.java b/src/main/java/net/rptools/maptool/client/MapTool.java
@@ -293,7 +293,7 @@ public static void showError(String msgKey) {
    */
   public static void showError(String msgKey, Throwable t) {
     String msg = generateMessage(msgKey, t);
-    log.error(msgKey, t);
+    log.error(I18N.getString(msgKey), t);
     showMessage(msg, "msg.title.messageDialogError", JOptionPane.ERROR_MESSAGE);
   }
 

diff --git a/src/main/java/net/rptools/maptool/model/Zone.java b/src/main/java/net/rptools/maptool/model/Zone.java
@@ -2109,6 +2109,10 @@ protected Object readResolve() {
     if (topologyTerrain == null) {
       topologyTerrain = new Area();
     }
+
+    if (aStarRounding == null) {
+      aStarRounding = AStarRoundingOptions.NONE;
+    }
     return this;
   }