From fa3b2f47924903b2296a66aa12078e52e840be8b Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Wed, 27 Apr 2016 20:04:17 +0200 Subject: [PATCH] Fixed preview not restoring effects when disabling a game --- Artemis/Artemis/Managers/EffectManager.cs | 5 ++--- Artemis/Artemis/ViewModels/Abstract/GameViewModel.cs | 10 +++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Artemis/Artemis/Managers/EffectManager.cs b/Artemis/Artemis/Managers/EffectManager.cs index 5c81fc0ec..5e90e4052 100644 --- a/Artemis/Artemis/Managers/EffectManager.cs +++ b/Artemis/Artemis/Managers/EffectManager.cs @@ -153,14 +153,13 @@ namespace Artemis.Managers _mainManager.Unpause(); PauseEffect = null; - if (ActiveEffect is GameModel) + Logger.Debug("Finishing change effect with pause"); + if (ActiveEffect is GameModel || ActiveEffect is ProfilePreviewModel) return; // Non-game effects are stored as the new LastEffect. General.Default.LastEffect = ActiveEffect.Name; General.Default.Save(); - - Logger.Debug("Finishing change effect with pause"); } /// diff --git a/Artemis/Artemis/ViewModels/Abstract/GameViewModel.cs b/Artemis/Artemis/ViewModels/Abstract/GameViewModel.cs index ef4c9563c..b13998197 100644 --- a/Artemis/Artemis/ViewModels/Abstract/GameViewModel.cs +++ b/Artemis/Artemis/ViewModels/Abstract/GameViewModel.cs @@ -116,7 +116,15 @@ namespace Artemis.ViewModels.Abstract else { if (_lastEffect != null) - MainManager.EffectManager.ChangeEffect(_lastEffect, true); + { + // Game models are only used if they are enabled + var gameModel = _lastEffect as GameModel; + if (gameModel != null) + if (!gameModel.Enabled) + MainManager.EffectManager.GetLastEffect(); + else + MainManager.EffectManager.ChangeEffect(_lastEffect, true); + } else MainManager.EffectManager.ClearEffect(); }