From 6da41400fb80ee21af6f9fcc20936525fda12bba Mon Sep 17 00:00:00 2001
From: SpoinkyNL <spoinky.nl@gmail.com>
Date: Tue, 23 Feb 2016 22:44:05 +0100
Subject: [PATCH] Potential fix for #31

---
 Artemis/Artemis/Models/MainModel.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Artemis/Artemis/Models/MainModel.cs b/Artemis/Artemis/Models/MainModel.cs
index 4d3001d00..f0ef13d90 100644
--- a/Artemis/Artemis/Models/MainModel.cs
+++ b/Artemis/Artemis/Models/MainModel.cs
@@ -112,6 +112,10 @@ namespace Artemis.Models
 
         private void ChangeEffect(EffectModel effectModel)
         {
+            // Can't set a new effect if ActiveKeyboard is null
+            if (ActiveKeyboard == null)
+                return;
+
             if (effectModel is OverlayModel)
                 throw new ArgumentException("Can't set an Overlay effect as the active effect");
 
@@ -160,6 +164,11 @@ namespace Artemis.Models
             if (Suspended)
             {
                 LoadLastKeyboard();
+
+                // Don't resume if no keyboard was found
+                if (ActiveKeyboard == null)
+                    return;
+
                 Suspended = false;
                 General.Default.Suspended = false;
                 General.Default.Save();