From 71196cd4cddb17afdbbc86ff459c3c6d99eba774 Mon Sep 17 00:00:00 2001
From: Doublestrike <doublestrike@cardforge.org>
Date: Sat, 12 Nov 2011 00:07:19 +0000
Subject: [PATCH] Minor null pointer fix in InputControl.

---
 src/main/java/forge/gui/input/InputControl.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/forge/gui/input/InputControl.java b/src/main/java/forge/gui/input/InputControl.java
index 0520b4f8e6f..a4adc2bac65 100644
--- a/src/main/java/forge/gui/input/InputControl.java
+++ b/src/main/java/forge/gui/input/InputControl.java
@@ -223,8 +223,10 @@ public class InputControl extends MyObservable implements java.io.Serializable {
         // *********************
         // Special phases handled above, everything else is handled simply by
         // priority
-
-        if (priority.isHuman()) {
+        if (priority == null) {
+            return null;
+        }
+        else if (priority.isHuman()) {
             final boolean skip = this.model.getGameState().getPhase().doSkipPhase();
             this.model.getGameState().getPhase().setSkipPhase(false);
             if ((this.model.getGameState().getStack().size() == 0)
@@ -234,9 +236,11 @@ public class InputControl extends MyObservable implements java.io.Serializable {
             } else {
                 return new InputPassPriority();
             }
-        } else if (playerTurn.isComputer()) {
+        }
+        else if (playerTurn.isComputer()) {
             return this.aiInput;
-        } else {
+        }
+        else {
             this.aiInput.getComputer().stackNotEmpty();
             return null;
         }