From cd30c8a9ffa87990f718d2f62eb3d8a376f5bd4e Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Tue, 13 Jun 2017 16:39:31 -0400
Subject: [PATCH] Fix Graphic Picker nullreference bug

---
 ShiftOS.WinForms/Applications/GraphicPicker.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ShiftOS.WinForms/Applications/GraphicPicker.cs b/ShiftOS.WinForms/Applications/GraphicPicker.cs
index f299f0d..2a31815 100644
--- a/ShiftOS.WinForms/Applications/GraphicPicker.cs
+++ b/ShiftOS.WinForms/Applications/GraphicPicker.cs
@@ -46,10 +46,13 @@ namespace ShiftOS.WinForms.Applications
             InitializeComponent();
             SelectedLayout = layout;
             Image = old;
-            using(var ms = new System.IO.MemoryStream())
+            if (Image != null)
             {
-                Image.Save(ms, System.Drawing.Imaging.ImageFormat.Png);
-                ImageAsBinary = ms.ToArray();
+                using (var ms = new System.IO.MemoryStream())
+                {
+                    Image.Save(ms, System.Drawing.Imaging.ImageFormat.Png);
+                    ImageAsBinary = ms.ToArray();
+                }
             }
             Callback = cb;
             lblobjecttoskin.Text = name;