Apply the fix from #3518 to pasting from context menu. Closes #2926.

gitextensions · Mar 22, 2017 · 4973b71 · 4973b71
1 parent cfe3d0d
commit 4973b71
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/GitUI/SpellChecker/EditNetSpell.cs b/GitUI/SpellChecker/EditNetSpell.cs
@@ -668,8 +668,7 @@ private void TextBox_KeyDown(object sender, KeyEventArgs e)
             // handle paste from clipboard (Ctrl+V, Shift+Ins)
             if((e.Control && e.KeyCode == Keys.V) || (e.Shift && e.KeyCode == Keys.Insert))
             {
-                // insert only text
-                ((RichTextBox)sender).Paste(DataFormats.GetFormat(DataFormats.UnicodeText));
+                PasteTextFromClipboard();
                 e.Handled = true;
                 return;
             }
@@ -689,6 +688,12 @@ private void TextBox_KeyDown(object sender, KeyEventArgs e)
             OnKeyDown(e);
         }
 
+        private void PasteTextFromClipboard()
+        {
+            // insert only text
+            TextBox.Paste(DataFormats.GetFormat(DataFormats.UnicodeText));
+        }
+
         private void TextBox_KeyPress(object sender, KeyPressEventArgs e)
         {
             OnKeyPress(e);
@@ -748,11 +753,7 @@ private void CopyMenuItemdClick(object sender, EventArgs e)
         private void PasteMenuItemClick(object sender, EventArgs e)
         {
             if (!Clipboard.ContainsText()) return;
-            // remove image data from clipboard
-            string text = Clipboard.GetText();
-            Clipboard.SetText(text);
-
-            TextBox.Paste();
+            PasteTextFromClipboard();
             CheckSpelling();
         }