From a5ebc87c949b9c3e8d1049df3f880d91a2e5e97c Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Thu, 13 Feb 2020 14:50:47 +0900
Subject: Fixed handling of alternative terminal application in MiniCli.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8b269b0658abb58555ea079126033ac9f8f0833c)
---
 kdesktop/kdesktop.kcfg | 10 +++++-----
 kdesktop/minicli.cpp   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index 8086ad8fd..53a1cc781 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -69,6 +69,11 @@
       <!-- krootwm.cc:496 -->
       <!--     config->writeEntry( "SortDirectoriesFirst", b ); -->
     </entry>
+		<entry key="TerminalApplication" type="Path">
+			<default>konsole</default>
+			<label>Terminal application</label>
+			<whatsthis>Defines which terminal application is used.</whatsthis>
+		</entry>
   </group>
   <group name="Mouse Buttons"> 
     <entry key="WheelSwitchesWorkspace" type="Bool">
@@ -83,11 +88,6 @@
       <!-- desktop.cc:397 -->
       <!--             (config->readEntry("WheelDirection", default_dir_string) == forward_string) ? Forward : Reverse; -->
     </entry>
-    <entry key="TerminalApplication" type="Path">
-      <default>konsole</default>
-      <label>Terminal application</label>
-      <whatsthis>Defines which terminal application is used.</whatsthis>
-    </entry>
     <entry key="Left" type="String">
       <default></default>
       <label>Left Mouse Button Action</label>
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index afc28f3b0..80387aca1 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -385,10 +385,10 @@ void Minicli::keyPressEvent( TQKeyEvent* e )
   TQDialog::keyPressEvent( e );
 }
 
-TQString Minicli::terminalCommand (const TQString& cmd, const TQString& args)
+TQString Minicli::terminalCommand(const TQString& cmd, const TQString& args)
 {
   TQString terminal = KDesktopSettings::terminalApplication().stripWhiteSpace();
-  if (terminal.endsWith("konsole"))
+  if (terminal.startsWith("konsole"))
     terminal += " --noclose";
 
   if( args.isEmpty() )
-- 
cgit v1.2.1