From 2616179e7f2953a56be4287aaff94c7dfdf4fe16 Mon Sep 17 00:00:00 2001
From: Darth Affe <darthaffe@wyrez.org>
Date: Sat, 4 Jun 2016 09:52:54 +0200
Subject: [PATCH] Updated the Corsair-Keyboard-DeviceProvider to benefit from
 CUE.NET 1.0.3

---
 .../DeviceProviders/Corsair/CorsairRGB.cs     | 42 ++++++-------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/Artemis/Artemis/DeviceProviders/Corsair/CorsairRGB.cs b/Artemis/Artemis/DeviceProviders/Corsair/CorsairRGB.cs
index dc43c1554..ba722f774 100644
--- a/Artemis/Artemis/DeviceProviders/Corsair/CorsairRGB.cs
+++ b/Artemis/Artemis/DeviceProviders/Corsair/CorsairRGB.cs
@@ -1,11 +1,11 @@
-using System;
-using System.Drawing;
+using System.Drawing;
 using System.Threading;
 using System.Windows;
 using Artemis.Properties;
 using Artemis.Utilities;
 using CUE.NET;
 using CUE.NET.Brushes;
+using CUE.NET.Devices.Generic.Enums;
 using CUE.NET.Devices.Keyboard;
 using Point = System.Drawing.Point;
 
@@ -14,6 +14,7 @@ namespace Artemis.DeviceProviders.Corsair
     public class CorsairRGB : KeyboardProvider
     {
         private CorsairKeyboard _keyboard;
+        private ImageBrush _keyboardBrush;
 
         public CorsairRGB()
         {
@@ -26,29 +27,13 @@ namespace Artemis.DeviceProviders.Corsair
 
         public override bool CanEnable()
         {
-            // If already initialized, return result right away
-            if (CueSDK.ProtocolDetails != null)
-                return CueSDK.KeyboardSDK != null;
-
-            // Else try to enable the SDK
             for (var tries = 0; tries < 9; tries++)
             {
-                if (CueSDK.ProtocolDetails != null)
-                    break;
-
-                try
-                {
-                    CueSDK.Initialize();
-                }
-                catch (Exception)
-                {
-                    Thread.Sleep(2000);
-                }
+                if (CueSDK.IsSDKAvailable(CorsairDeviceType.Keyboard))
+                    return true;
+                Thread.Sleep(2000);
             }
-
-            if (CueSDK.ProtocolDetails == null)
-                return false;
-            return CueSDK.KeyboardSDK != null;
+            return false;
         }
 
         /// <summary>
@@ -56,7 +41,7 @@ namespace Artemis.DeviceProviders.Corsair
         /// </summary>
         public override void Enable()
         {
-            if (CueSDK.ProtocolDetails == null)
+            if (!CueSDK.IsInitialized)
                 CueSDK.Initialize();
 
             _keyboard = CueSDK.KeyboardSDK;
@@ -83,11 +68,13 @@ namespace Artemis.DeviceProviders.Corsair
                     PreviewSettings = new PreviewSettings(665, 215, new Thickness(0, -5, 0, 0), Resources.strafe);
                     break;
             }
+
+            _keyboard.Brush = _keyboardBrush ?? (_keyboardBrush = new ImageBrush());
         }
 
         public override void Disable()
         {
-            if (CueSDK.ProtocolDetails != null)
+            if (CueSDK.IsInitialized)
                 CueSDK.Reinitialize();
         }
 
@@ -113,12 +100,7 @@ namespace Artemis.DeviceProviders.Corsair
                 image = strafeBitmap;
             }
 
-            var brush = new ImageBrush
-            {
-                Image = image
-            };
-
-            _keyboard.Brush = brush;
+            _keyboardBrush.Image = image;
             _keyboard.Update();
         }
     }