From 1af2f7848ea982f6dbcd23b9649dbf4dedc3b315 Mon Sep 17 00:00:00 2001
From: David Sparer <David.Sparer@pearson.com>
Date: Fri, 14 Apr 2017 12:39:13 -0600
Subject: [PATCH] added some error handling when repo unlocking fails

---
 .../CompositeCredentialRepoUnlockerForm.cs    | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/mRemoteV1/UI/Forms/CompositeCredentialRepoUnlockerForm.cs b/mRemoteV1/UI/Forms/CompositeCredentialRepoUnlockerForm.cs
index 8256f4f7f..3b6b5e9ed 100644
--- a/mRemoteV1/UI/Forms/CompositeCredentialRepoUnlockerForm.cs
+++ b/mRemoteV1/UI/Forms/CompositeCredentialRepoUnlockerForm.cs
@@ -22,10 +22,19 @@ namespace mRemoteNG.UI.Forms
 
         private void buttonUnlock_Click(object sender, EventArgs e)
         {
-            _repositoryUnlocker.Unlock(secureTextBoxPassword.SecString);
-            secureTextBoxPassword.Clear();
-            _repositoryUnlocker.SelectNextLockedRepository();
-            objectListViewRepos.SelectedObject = _repositoryUnlocker.SelectedRepository;
+            try
+            {
+                _repositoryUnlocker.Unlock(secureTextBoxPassword.SecString);
+                SelectNextLockedRepo();
+            }
+            catch (Exception exception)
+            {
+                Console.WriteLine(exception);
+            }
+            finally
+            {
+                secureTextBoxPassword.Clear();
+            }
         }
 
         private void buttonClose_Click(object sender, EventArgs e)
@@ -33,6 +42,12 @@ namespace mRemoteNG.UI.Forms
             Close();
         }
 
+        private void SelectNextLockedRepo()
+        {
+            _repositoryUnlocker.SelectNextLockedRepository();
+            objectListViewRepos.SelectedObject = _repositoryUnlocker.SelectedRepository;
+        }
+
         private void objectListViewRepos_SelectionChanged(object sender, EventArgs e)
         {
             objectListViewRepos.RefreshObjects(_repositoryUnlocker.Repositories.ToList());