From 985b840af302eaf32c5299410b2b2ecc17efda3c Mon Sep 17 00:00:00 2001
From: SpoinkyNL <spoinky.nl@gmail.com>
Date: Thu, 2 Jun 2016 21:41:50 +0200
Subject: [PATCH] Re-enabled Razer, fixed profile import when no keyboard is
 active

---
 Artemis/Artemis/ArtemisBootstrapper.cs                      | 2 +-
 Artemis/Artemis/DeviceProviders/Razer/BlackWidow.cs         | 6 ------
 .../Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs   | 1 +
 .../Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs   | 6 ++++++
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Artemis/Artemis/ArtemisBootstrapper.cs b/Artemis/Artemis/ArtemisBootstrapper.cs
index 116221d3c..52719ec46 100644
--- a/Artemis/Artemis/ArtemisBootstrapper.cs
+++ b/Artemis/Artemis/ArtemisBootstrapper.cs
@@ -20,7 +20,7 @@ namespace Artemis
 
         public ArtemisBootstrapper()
         {
-            //CheckDuplicateInstances();
+            CheckDuplicateInstances();
             Initialize();
             BindSpecialValues();
         }
diff --git a/Artemis/Artemis/DeviceProviders/Razer/BlackWidow.cs b/Artemis/Artemis/DeviceProviders/Razer/BlackWidow.cs
index 752c2081b..fa28bdc44 100644
--- a/Artemis/Artemis/DeviceProviders/Razer/BlackWidow.cs
+++ b/Artemis/Artemis/DeviceProviders/Razer/BlackWidow.cs
@@ -4,7 +4,6 @@ using Artemis.DeviceProviders.Razer.Utilities;
 using Artemis.Properties;
 using Corale.Colore.Core;
 using Corale.Colore.Razer;
-using Corale.Colore.Razer.Keyboard;
 using Constants = Corale.Colore.Razer.Keyboard.Constants;
 
 namespace Artemis.DeviceProviders.Razer
@@ -25,8 +24,6 @@ namespace Artemis.DeviceProviders.Razer
 
         public override bool CanEnable()
         {
-            return true;
-
             if (!Chroma.IsSdkAvailable())
                 return false;
 
@@ -38,19 +35,16 @@ namespace Artemis.DeviceProviders.Razer
 
         public override void Enable()
         {
-            return;
             Chroma.Instance.Initialize();
         }
 
         public override void Disable()
         {
-            return;
             Chroma.Instance.Uninitialize();
         }
 
         public override void DrawBitmap(Bitmap bitmap)
         {
-            return;
             var razerArray = RazerUtilities.BitmapColorArray(bitmap, Height, Width);
             Chroma.Instance.Keyboard.SetCustom(razerArray);
         }
diff --git a/Artemis/Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs b/Artemis/Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs
index ee27a983f..e049852d5 100644
--- a/Artemis/Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs
+++ b/Artemis/Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs
@@ -133,6 +133,7 @@ namespace Artemis.ViewModels.Flyouts
         // TODO https://github.com/ninject/Ninject.Extensions.Logging/issues/35
         private void ApplyLogging()
         {
+            return;
             var c = LogManager.Configuration;
             var file = c.FindTargetByName("file") as FileTarget;
             if (file == null)
diff --git a/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs b/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs
index a9737b21f..01b6381f6 100644
--- a/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs
+++ b/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs
@@ -560,6 +560,12 @@ namespace Artemis.ViewModels.Profiles
 
         public async void ImportProfile()
         {
+            if (_mainManager.DeviceManager.ActiveKeyboard == null)
+            {
+                DialogService.ShowMessageBox("Cannot import profile.",
+                    "To import a profile, please select a keyboard in the options menu first.");
+                return;
+            }
             var dialog = new OpenFileDialog {Filter = "Artemis profile (*.xml)|*.xml"};
             var result = dialog.ShowDialog();
             if (result != DialogResult.OK)