Potential fix for #31

This commit is contained in:
SpoinkyNL committed 2016-02-24 20:56:02 +01:00
1 parent 06c8a70e42
commit 6da41400fb
1 file changed
+9
+9
View File
@@ -112,6 +112,10 @@ namespace Artemis.Models
private void ChangeEffect(EffectModel effectModel) private void ChangeEffect(EffectModel effectModel)
{ {
// Can't set a new effect if ActiveKeyboard is null
if (ActiveKeyboard == null)
return;
if (effectModel is OverlayModel) if (effectModel is OverlayModel)
throw new ArgumentException("Can't set an Overlay effect as the active effect"); throw new ArgumentException("Can't set an Overlay effect as the active effect");
@@ -160,6 +164,11 @@ namespace Artemis.Models
if (Suspended) if (Suspended)
{ {
LoadLastKeyboard(); LoadLastKeyboard();
// Don't resume if no keyboard was found
if (ActiveKeyboard == null)
return;
Suspended = false; Suspended = false;
General.Default.Suspended = false; General.Default.Suspended = false;
General.Default.Save(); General.Default.Save();