diff options
author | Eric Hameleers <alien@slackware.com> | 2020-07-31 16:13:18 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-07-31 16:13:18 +0200 |
commit | 703149752c6265b36973d2c1f0f5a69721e3128a (patch) | |
tree | 7ded0d801771d5705f48ffbfb48f37dd4829439e /kde/patch/konsole/konsole.konsolepart.segfault.closing.session.via.menu.patch | |
parent | dd005500c624d127321ff3fe14a0c29bfa8d67f7 (diff) | |
parent | cd7ff1719433fbb3b6a8304596be173bc1b91b00 (diff) | |
download | ktown-master.tar.gz ktown-master.tar.xz |
Diffstat (limited to 'kde/patch/konsole/konsole.konsolepart.segfault.closing.session.via.menu.patch')
-rw-r--r-- | kde/patch/konsole/konsole.konsolepart.segfault.closing.session.via.menu.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/kde/patch/konsole/konsole.konsolepart.segfault.closing.session.via.menu.patch b/kde/patch/konsole/konsole.konsolepart.segfault.closing.session.via.menu.patch deleted file mode 100644 index 914031b..0000000 --- a/kde/patch/konsole/konsole.konsolepart.segfault.closing.session.via.menu.patch +++ /dev/null @@ -1,58 +0,0 @@ -From fdfae25665731882687da8721e58c3c56a3babf8 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Thu, 28 May 2020 09:28:06 -0400 -Subject: Fix crash when closing session in KonsolePart via menu - -This close method is also used when closing a Konsole session -via the X on the tabbar and tabheader. - -FIXED-IN: 20.08.0 -BUG: 420817 -BUG: 420695 -BUG: 415762 - -See merge request !87 ---- - src/SessionController.cpp | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/src/SessionController.cpp b/src/SessionController.cpp -index 006ba8b..e72f342 100644 ---- a/src/SessionController.cpp -+++ b/src/SessionController.cpp -@@ -999,16 +999,23 @@ void SessionController::closeSession() - return; - } - -- if (confirmClose()) { -- if (_session->closeInNormalWay()) { -+ if (!confirmClose()) { -+ return; -+ } -+ -+ if (!_session->closeInNormalWay()) { -+ if (!confirmForceClose()) { - return; -- } else if (confirmForceClose()) { -- if (_session->closeInForceWay()) { -- return; -- } else { -- qCDebug(KonsoleDebug) << "Konsole failed to close a session in any way."; -- } - } -+ -+ if (!_session->closeInForceWay()) { -+ qCDebug(KonsoleDebug) << "Konsole failed to close a session in any way."; -+ return; -+ } -+ } -+ -+ if (factory()) { -+ factory()->removeClient(this); - } - } - --- -cgit v1.1 - - |