Merge remote-tracking branch 'refs/remotes/idealist1508/FormCommit'

gitextensions · Jan 6, 2016 · 695e696 · 695e696
2 parents fa94ad6 + b6d4a6f
commit 695e696
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/GitUI/SpellChecker/EditNetSpell.cs b/GitUI/SpellChecker/EditNetSpell.cs
@@ -268,6 +268,9 @@ private void EditNetSpellLoad(object sender, EventArgs e)
 
         private void LoadDictionary()
         {
+            // Don`t load a dictionary in Design-time
+            if (Site != null && Site.DesignMode) return;
+
             string dictionaryFile = string.Concat(Path.Combine(AppSettings.GetDictionaryDir(), Settings.Dictionary), ".dic");
 
             if (_wordDictionary == null || _wordDictionary.DictionaryFile != dictionaryFile)
@@ -1029,6 +1032,8 @@ protected override void Dispose(bool disposing)
         {
             if (disposing)
             {
+                CancelAutoComplete();
+                SpellCheckTimer.Stop();
                 _autoCompleteCancellationTokenSource.Dispose();
                 _customUnderlines.Dispose();
                 if (components != null)