From f7d82c00d5564e52eb8b8a7d5d99d3476944a6a4 Mon Sep 17 00:00:00 2001
From: Krazy <mitchell@krazyweb.net>
Date: Sun, 1 Jun 2014 05:19:50 +0000
Subject: [PATCH] Fixed crash on startup.

---
 .../home/quest/CSubmenuQuestDraft.java        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java
index 15805b7e4aa..71d91e5f9cb 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java
@@ -80,8 +80,12 @@ public enum CSubmenuQuestDraft implements ICDoc {
                 new UiCommand() { @Override
                     public void run() { CSubmenuQuestDraft.this.endTournamentAndAwardPrizes(); } });
         
-        if (FModel.getQuest().getAchievements().getDraftEvents().isEmpty()) {
+        if (FModel.getQuest().getAchievements() == null) {
             view.setMode(Mode.EMPTY);
+        } else if (FModel.getQuest().getAchievements().getDraftEvents() == null || FModel.getQuest().getAchievements().getDraftEvents().isEmpty()) {
+            QuestAchievements achievements = FModel.getQuest().getAchievements();
+            achievements.generateNewTournaments();
+            view.setMode(Mode.SELECT_TOURNAMENT);
         } else if (FModel.getQuest().getDraftDecks() == null || !FModel.getQuest().getDraftDecks().contains(QuestEventDraft.DECK_NAME)) {
             view.setMode(Mode.SELECT_TOURNAMENT);
         } else if (!FModel.getQuest().getAchievements().getCurrentDraft().isStarted()) {
@@ -274,7 +278,15 @@ public enum CSubmenuQuestDraft implements ICDoc {
         
         VSubmenuQuestDraft view = VSubmenuQuestDraft.SINGLETON_INSTANCE;
         
-        if (FModel.getQuest().getAchievements() == null || FModel.getQuest().getAchievements().getDraftEvents().isEmpty()) {
+        if (FModel.getQuest().getAchievements() == null) {
+            view.setMode(Mode.EMPTY);
+            return;
+        }
+        
+        QuestAchievements achievements = FModel.getQuest().getAchievements();
+        achievements.generateNewTournaments();
+        
+        if (FModel.getQuest().getAchievements().getDraftEvents().isEmpty()) {
             view.setMode(Mode.EMPTY);
             return;
         }
@@ -291,9 +303,6 @@ public enum CSubmenuQuestDraft implements ICDoc {
         
         QuestDraftUtils.update();
         
-        QuestAchievements achievements = FModel.getQuest().getAchievements();
-        achievements.generateNewTournaments();
-        
         switch (view.getMode()) {
         
             case SELECT_TOURNAMENT: