From 7cb80f7234f2e218ae161df395f93cdf1364a7bd Mon Sep 17 00:00:00 2001
From: SpoinkyNL <spoinky.nl@gmail.com>
Date: Wed, 27 Apr 2016 20:19:51 +0200
Subject: [PATCH] Fixed a bug where the program would get stuck trying to
 connect to an unconnected keyboard

---
 Artemis/Artemis/Managers/KeyboardManager.cs                 | 2 ++
 .../Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs   | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Artemis/Artemis/Managers/KeyboardManager.cs b/Artemis/Artemis/Managers/KeyboardManager.cs
index f6e7c9d1f..7833663c8 100644
--- a/Artemis/Artemis/Managers/KeyboardManager.cs
+++ b/Artemis/Artemis/Managers/KeyboardManager.cs
@@ -52,6 +52,8 @@ namespace Artemis.Managers
             if (!keyboardProvider.CanEnable())
             {
                 _mainManager.DialogService.ShowErrorMessageBox(keyboardProvider.CantEnableText);
+                General.Default.LastKeyboard = null;
+                General.Default.Save();
                 return;
             }
 
diff --git a/Artemis/Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs b/Artemis/Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs
index 192b1f0a3..0489064a0 100644
--- a/Artemis/Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs
+++ b/Artemis/Artemis/ViewModels/Flyouts/FlyoutSettingsViewModel.cs
@@ -126,9 +126,9 @@ namespace Artemis.ViewModels.Flyouts
 
         protected override void HandleOpen()
         {
-            SelectedKeyboardProvider = General.Default.LastKeyboard.Length > 0
-                ? General.Default.LastKeyboard
-                : "None";
+            SelectedKeyboardProvider = string.IsNullOrEmpty(General.Default.LastKeyboard)
+                ? "None"
+                : General.Default.LastKeyboard;
         }
     }
 }
\ No newline at end of file