[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [konsole/Applications/16.12] src: Only use foreground process info if valid
From:       Kurt Hindenburg <kurt.hindenburg () gmail ! com>
Date:       2016-11-24 14:47:45
Message-ID: E1c9vJR-0004RX-6E () code ! kde ! org
[Download RAW message or body]

Git commit d28afb6664459cf28d73d7617b74c49711ce7a86 by Kurt Hindenburg, on behalf of Martin T. H. Sandsmark.
Committed on 24/11/2016 at 14:42.
Pushed by hindenburg into branch 'Applications/16.12'.

Only use foreground process info if valid

getProcessInfo() returned _foregroundProcessInfo without checking the
return value of updateForegroundProcessInfo() indicating whether
_foregroundProcessInfo was non-existent or invalid.

I think this might be the solution to a bunch of recent crash bugs,
but not closing them as I can't test.

Also skipping RB because it is a simple patch and RB is down from here.

CCBUG: 372401
CCBUG: 372620
CCBUG: 372619
CCBUG: 372593
(cherry picked from commit 40b1f0e851c115e1a2df79e7ec4bc4fe726d9e43)

M  +1    -2    src/Session.cpp

https://commits.kde.org/konsole/d28afb6664459cf28d73d7617b74c49711ce7a86

diff --git a/src/Session.cpp b/src/Session.cpp
index 3269550..d63c8a0 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -961,8 +961,7 @@ ProcessInfo* Session::getProcessInfo()
 {
     ProcessInfo* process = 0;
 
-    if (isForegroundProcessActive()) {
-        updateForegroundProcessInfo();
+    if (isForegroundProcessActive() && updateForegroundProcessInfo()) {
         process = _foregroundProcessInfo;
     } else {
         updateSessionProcessInfo();

[prev in list] [next in list] [prev in thread] [next in thread]