Merge pull request #3080 from Windchild292/dev_Windchild_LoadCancelCa…

…ncellationException Fixing CancellationException During Cancelled Startup
MegaMek · Jan 26, 2022 · 521a1e6 · 521a1e6
2 parents 3729daa + 2edcfda
commit 521a1e6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java b/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java
@@ -52,6 +52,7 @@
 import java.io.FileInputStream;
 import java.time.LocalDate;
 import java.util.ResourceBundle;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 
 public class DataLoadingDialog extends JDialog implements PropertyChangeListener {
@@ -268,7 +269,7 @@ public void done() {
             Campaign campaign = null;
             try {
                 campaign = get();
-            } catch (InterruptedException e) {
+            } catch (InterruptedException | CancellationException e) {
                 cancelled = true;
                 cancel(true);
             } catch (ExecutionException e) {