DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-01-01 10:13:30 +00:00
Code Issues Releases Wiki Activity

Fixed high CPU usage after editing a profile while it's active

Browse Source
This commit is contained in:
SpoinkyNL 2016-06-06 16:01:22 +02:00
parent 49ca507a5c
commit 6e390ab3a7
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Artemis/Artemis/Managers/ProfileManager.cs
View File

@ -54,16 +54,14 @@ namespace Artemis.Managers
if (_effectManager.ActiveEffect != ProfilePreviewModel) if (_effectManager.ActiveEffect != ProfilePreviewModel)
return; return;
if (_prePreviewEffect != null) _logger.Debug("Clear effect after profile preview");
{ _effectManager.ClearEffect();
_logger.Debug("Change back effect after profile preview");
_effectManager.ChangeEffect(_prePreviewEffect); if (_prePreviewEffect == null || _prePreviewEffect is GameModel)
} return;
else
{ _logger.Debug("Change back effect after profile preview");
_logger.Debug("Clear effect after profile preview"); _effectManager.ChangeEffect(_prePreviewEffect);
_effectManager.ClearEffect();
}
} }
else else
{ {

6
Artemis/Artemis/Modules/Effects/ProfilePreview/ProfilePreviewModel.cs
View File

@ -48,11 +48,11 @@ namespace Artemis.Modules.Effects.ProfilePreview
var renderLayers = GetRenderLayers(renderMice, renderHeadsets); var renderLayers = GetRenderLayers(renderMice, renderHeadsets);
// Render the keyboard layer-by-layer // Render the keyboard layer-by-layer
keyboard = Profile.GenerateBitmap(renderLayers, DataModel, MainManager.DeviceManager.ActiveKeyboard.KeyboardRectangle(4), true, true); keyboard = Profile?.GenerateBitmap(renderLayers, DataModel, MainManager.DeviceManager.ActiveKeyboard.KeyboardRectangle(4), true, true);
// Render the first enabled mouse (will default to null if renderMice was false) // Render the first enabled mouse (will default to null if renderMice was false)
mouse = Profile.GenerateBrush(renderLayers.FirstOrDefault(l => l.LayerType == LayerType.Mouse), DataModel); mouse = Profile?.GenerateBrush(renderLayers.LastOrDefault(l => l.LayerType == LayerType.Mouse), DataModel);
// Render the first enabled headset (will default to null if renderHeadsets was false) // Render the first enabled headset (will default to null if renderHeadsets was false)
headset = Profile.GenerateBrush(renderLayers.FirstOrDefault(l => l.LayerType == LayerType.Headset), DataModel); headset = Profile?.GenerateBrush(renderLayers.LastOrDefault(l => l.LayerType == LayerType.Headset), DataModel);
} }
} }