# HG changeset patch
# User Torsten <ttl@justmail.de>
# Date 1430146117 -7200
# Node ID 4ba6c61c8794c7dc2c25f6d361ff8767b5a01f1b
# Parent  46fb763e5f3a7f35604bde37508208477c8ec244
no copying of empty text in terminal when copy shortcut is not Ctrl-C

* TerminalView.cpp (copyClipboard):
* QWinTerminalImpl.cpp (copyClipboard):
  in the case of an extra interrupt action, do not copy to clipboard
  without correctly checking for selected text

diff -r 46fb763e5f3a -r 4ba6c61c8794 libgui/qterminal/libqterminal/unix/TerminalView.cpp
--- a/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Fri Apr 24 23:36:59 2015 -0500
+++ b/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Mon Apr 27 16:48:37 2015 +0200
@@ -2281,8 +2281,11 @@
 
   QString text = _screenWindow->selectedText(_preserveLineBreaks);
 
-  if (text.isEmpty () && ! extra_interrupt)
-    emit interrupt_signal ();
+  if (text.isEmpty ())
+    {
+      if (! extra_interrupt)
+        emit interrupt_signal ();
+    }
   else
     QApplication::clipboard()->setText(text);
 }
diff -r 46fb763e5f3a -r 4ba6c61c8794 libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Fri Apr 24 23:36:59 2015 -0500
+++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Mon Apr 27 16:48:37 2015 +0200
@@ -1769,12 +1769,14 @@
 
   QString selection = d->getSelection ();
 
-  if (selection.isEmpty () && ! _extra_interrupt)
-    terminal_interrupt ();
+  if (selection.isEmpty ())
+    {
+      if (! _extra_interrupt)
+        terminal_interrupt ();
+    }
   else
     {
       clipboard->setText (selection);
-
       emit report_status_message (tr ("copied selection to clipboard"));
     }
 }