From d47f347bebea00c45172684d63c75b414f100c09 Mon Sep 17 00:00:00 2001
From: SpoinkyNL <mail@rbeekman.nl>
Date: Sat, 20 Jun 2020 18:39:56 +0200
Subject: [PATCH] Core - Fixed plugins not loading, oops

---
 src/Artemis.Core/Services/CoreService.cs                | 4 ++--
 src/Artemis.UI/Screens/Settings/Debug/DebugViewModel.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Artemis.Core/Services/CoreService.cs b/src/Artemis.Core/Services/CoreService.cs
index e4bc733cf..2d3855246 100644
--- a/src/Artemis.Core/Services/CoreService.cs
+++ b/src/Artemis.Core/Services/CoreService.cs
@@ -77,8 +77,8 @@ namespace Artemis.Core.Services
             ApplyLoggingLevel();
 
             // Initialize the services
-            // _pluginService.CopyBuiltInPlugins();
-            // _pluginService.LoadPlugins();
+            _pluginService.CopyBuiltInPlugins();
+            _pluginService.LoadPlugins();
 
             var surfaceConfig = _surfaceService.ActiveSurface;
             if (surfaceConfig != null)
diff --git a/src/Artemis.UI/Screens/Settings/Debug/DebugViewModel.cs b/src/Artemis.UI/Screens/Settings/Debug/DebugViewModel.cs
index cdb456b44..b0de9e77f 100644
--- a/src/Artemis.UI/Screens/Settings/Debug/DebugViewModel.cs
+++ b/src/Artemis.UI/Screens/Settings/Debug/DebugViewModel.cs
@@ -55,7 +55,7 @@ namespace Artemis.UI.Screens.Settings.Debug
         {
             Execute.PostToUIThread(() =>
             {
-                if (e.BitmapBrush.Bitmap == null)
+                if (e.BitmapBrush?.Bitmap == null)
                     return;
 
                 if (!(CurrentFrame is WriteableBitmap writeableBitmap))