From 3c6d45ff0ce1e7f2d55f6d4be17e984d42020c0a Mon Sep 17 00:00:00 2001
From: NikolayHD <hidalgo1984@list.ru>
Date: Sat, 10 Aug 2019 03:35:51 +0300
Subject: [PATCH] Fix null reference exception when loading deck

in sealed or draft deck editor
---
 .../deckeditor/controllers/DeckController.java        | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java
index f2a01e17c64..30b034a5de8 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java
@@ -88,12 +88,11 @@ public class DeckController<T extends DeckBase> {
      * Load deck from file or clipboard
      */
     public void loadDeck(Deck deck) {
-
-        if (deck.getName() == "") {
-            newModel();
-        }
-
-        if (!view.getCatalogManager().isInfinite()) {
+        if (view.getCatalogManager().isInfinite()) {
+            if (deck.getName() == "") {
+                newModel();
+            }
+        } else {
             CardPool catalogClone = new CardPool(view.getInitialCatalog());
             deck = pickFromCatalog(deck, catalogClone);
             ItemPool<PaperCard> catalogPool = view.getCatalogManager().getPool();