From 354996ca8aa4daec8cd6b73fa3b126c0bf9aedd7 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Fri, 12 Feb 2016 02:15:23 +0200
Subject: [PATCH] After import update hotkeys

---
 ShareX/Forms/ApplicationSettingsForm.cs |  2 +-
 ShareX/Forms/MainForm.cs                | 14 +++++++++++++-
 ShareX/HotkeyManager.cs                 | 10 ++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ShareX/Forms/ApplicationSettingsForm.cs b/ShareX/Forms/ApplicationSettingsForm.cs
index 68db98e2a..6ec5b839f 100644
--- a/ShareX/Forms/ApplicationSettingsForm.cs
+++ b/ShareX/Forms/ApplicationSettingsForm.cs
@@ -503,7 +503,7 @@ private void btnImport_Click(object sender, EventArgs e)
                             btnImport.Enabled = true;
                         }
 
-                        Program.MainForm.UpdateControls();
+                        Program.MainForm.UpdateAll();
                     });
                 }
             }
diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs
index 9e196250f..1011ef1bc 100644
--- a/ShareX/Forms/MainForm.cs
+++ b/ShareX/Forms/MainForm.cs
@@ -173,7 +173,7 @@ private void InitializeControls()
             HandleCreated += MainForm_HandleCreated;
         }
 
-        public void UpdateControls()
+        private void UpdateControls()
         {
             niTray.Visible = Program.Settings.ShowTray;
 
@@ -246,6 +246,18 @@ public void UpdateControls()
             AfterSettingsJobs();
         }
 
+        public void UpdateAll()
+        {
+            UpdateControls();
+
+            if (Program.HotkeyManager != null)
+            {
+                Program.HotkeyManager.UpdateHotkeys(Program.HotkeysConfig.Hotkeys, true);
+            }
+
+            UpdateWorkflowsMenu();
+        }
+
         private void AfterShownJobs()
         {
             if (Program.IsFirstTimeConfig)
diff --git a/ShareX/HotkeyManager.cs b/ShareX/HotkeyManager.cs
index 139f2bc2e..69dc81d7b 100644
--- a/ShareX/HotkeyManager.cs
+++ b/ShareX/HotkeyManager.cs
@@ -52,6 +52,16 @@ public HotkeyManager(HotkeyForm form, List<HotkeySettings> hotkeys, bool showFai
             hotkeyForm.HotkeyPress += hotkeyForm_HotkeyPress;
             hotkeyForm.FormClosed += (sender, e) => hotkeyForm.InvokeSafe(() => UnregisterAllHotkeys(false));
 
+            UpdateHotkeys(hotkeys, showFailedHotkeys);
+        }
+
+        public void UpdateHotkeys(List<HotkeySettings> hotkeys, bool showFailedHotkeys)
+        {
+            if (Hotkeys != null)
+            {
+                UnregisterAllHotkeys();
+            }
+
             Hotkeys = hotkeys;
 
             RegisterAllHotkeys();