DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Potential fix for #31

Browse Source
This commit is contained in:
SpoinkyNL 2016-02-23 22:44:05 +01:00
parent 06c8a70e42
commit 6da41400fb
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Artemis/Artemis/Models/MainModel.cs
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();