From 7ac3f974b9e08d16cd412599484d26aa3b8873fd Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Wed, 14 Oct 2015 01:28:54 -0500
Subject: [PATCH] Fix for NPE the first time you create a new image and try to
 draw -- the state management was setting a null when there was no previous
 state

---
 .../org/badvision/outlaweditor/apple/AppleImageEditor.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleImageEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleImageEditor.java
index fe5318cb..3137d19d 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleImageEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleImageEditor.java
@@ -100,7 +100,12 @@ public class AppleImageEditor extends ImageEditor implements EventHandler<MouseE
     public void setState(EnumMap oldState) {
         state.putAll(oldState);
         changeCurrentPattern((FillPattern) state.get(StateVars.PATTERN));
-        _setDrawMode((DrawMode) state.get(StateVars.DRAW_MODE));
+        DrawMode oldDrawMode = (DrawMode) state.get(StateVars.DRAW_MODE);
+        if (oldDrawMode != null) {
+            _setDrawMode(oldDrawMode);
+        } else {
+            state.put(StateVars.DRAW_MODE, currentDrawMode);
+        }
     }
     
     @Override