From 927a4ec2a87c68d77ecb375721026a23782d0a8d Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Mon, 12 Jun 2017 03:33:54 +0000
Subject: [PATCH] - Fixed a crash when trying to start Puzzle mode without
 selecting a puzzle first.

---
 .../java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java
index 6a1966649cf..480e3bc87c2 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java
@@ -2,6 +2,7 @@ package forge.screens.home.puzzle;
 
 import forge.GuiBase;
 import forge.UiCommand;
+import forge.assets.FSkinProp;
 import forge.deck.Deck;
 import forge.game.GameRules;
 import forge.game.GameType;
@@ -17,6 +18,7 @@ import forge.player.GamePlayerUtil;
 import forge.puzzle.Puzzle;
 import forge.puzzle.PuzzleIO;
 import forge.quest.QuestUtil;
+import forge.util.gui.SOptionPane;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -71,6 +73,10 @@ public enum CSubmenuPuzzleSolve implements ICDoc, IMenuProvider {
 
     private boolean startPuzzleSolve() {
         final Puzzle selected = (Puzzle)view.getList().getSelectedValue();
+        if (selected == null) {
+            SOptionPane.showMessageDialog("Please select a puzzle from the list first!", "No puzzle selected", FSkinProp.ICO_ERROR);
+            return false;
+        }
 
         SwingUtilities.invokeLater(new Runnable() {
             @Override