File Fix-checking-of-foreground-process.patch of Package konsole

Overview Repositories Revisions Requests Users Attributes Meta

File Fix-checking-of-foreground-process.patch of Package konsole (Revision 39dde7d91520d7ab402ad711cb9ff108)

Currently displaying revision 39dde7d91520d7ab402ad711cb9ff108 , Show latest

From: Martin T. H. Sandsmark <martin.sandsmark@kde.org>
Date: Sun, 28 Aug 2016 12:41:42 +0000
Subject: Fix checking of foreground process
X-Git-Url: http://quickgit.kde.org/?p=konsole.git&a=commitdiff&h=79ca76a94696eda408927b122b0b531676d4ba93
---
Fix checking of foreground process

The old method of checking it has unnecessary overhead (doing a full
process info update), and wasn't very reliable.

Instead just get the original shell PID from QProcess (via KProcess),
and the foreground process from the PTY.

CCBUG: 367746
REVIEW: 128789
---

--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -536,8 +536,9 @@
 
     QStringList processesRunning;
     foreach(Session *session, _viewManager->sessions()) {
-        if (!session)
+        if (!session || !session->isForegroundProcessActive()) {
             continue;
+        }
 
         const QString defaultProc = session->program().split('/').last();
         const QString currentProc = session->foregroundProcessName().split('/').last();

--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -823,9 +823,7 @@
     }
 
     // Check if the default shell is running, in that case try sending an EOF for a clean exit
-    const QString defaultProc = program().split('/').last();
-    const QString currentProc = foregroundProcessName().split('/').last();
-    if (defaultProc == currentProc) {
+    if (!isForegroundProcessActive()) {
         _shellProcess->sendEof();
 
         if (_shellProcess->waitForFinished(1000)) {
@@ -992,6 +990,9 @@
     ProcessInfo* process = 0;
 
     if (isForegroundProcessActive()) {
+        if (_foregroundProcessInfo == nullptr) {
+            updateForegroundProcessInfo();
+        }
         process = _foregroundProcessInfo;
     } else {
         updateSessionProcessInfo();
@@ -1507,7 +1508,7 @@
 bool Session::isForegroundProcessActive()
 {
     // foreground process info is always updated after this
-    return updateForegroundProcessInfo() && (processId() != _foregroundPid);
+    return (_shellProcess->pid() != _shellProcess->foregroundProcessGroup());
 }
 
 QString Session::foregroundProcessName()

Places

File Fix-checking-of-foreground-process.patch of Package konsole (Revision 39dde7d91520d7ab402ad711cb9ff108)

Places