[SCM] konsole packaging branch, master, updated. debian/16.12.0-1-24-g209481c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=e12957d

The following commit has been merged in the master branch:
commit e12957d2add238cb724091cc7cc558064c59a223
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu May 11 14:53:00 2017 +0200

    Add patch: Add-check-for-valid-container-possible-crash-fix.patch
    
    Cherry-picked from "Add check for valid container (possible crash fix)"
    (a2b6a81)
    
    Related to KDE#375540
    
    Gbp-Dch: Full
---
 ...ck-for-valid-container-possible-crash-fix.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/Add-check-for-valid-container-possible-crash-fix.patch b/debian/patches/Add-check-for-valid-container-possible-crash-fix.patch
new file mode 100644
index 0000000..9f59b97
--- /dev/null
+++ b/debian/patches/Add-check-for-valid-container-possible-crash-fix.patch
@@ -0,0 +1,26 @@
+From: Kurt Hindenburg <kurt.hindenburg at gmail.com>
+Date: Fri, 21 Apr 2017 21:40:32 -0400
+Subject: Add check for valid container (possible crash fix)
+
+Possible fix for crashes from ambiguous shortcuts.  I have been unable
+to duplicate the crashes.
+
+CCBUG: 375540
+---
+ src/ViewManager.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
+index c187e646..50d650d1 100644
+--- a/src/ViewManager.cpp
++++ b/src/ViewManager.cpp
+@@ -905,6 +905,9 @@ void ViewManager::saveSessions(KConfigGroup& group)
+     // first: sessions in the active container, preserving the order
+     ViewContainer* container = _viewSplitter->activeContainer();
+     Q_ASSERT(container);
++    if (container == nullptr) {
++        return;
++    }
+     TerminalDisplay* activeview = qobject_cast<TerminalDisplay*>(container->activeView());
+ 
+     QListIterator<QWidget*> viewIter(container->views());
diff --git a/debian/patches/series b/debian/patches/series
index 2e00283..9f2f69c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ Limit-ourselves-to-3-combining-characters.patch
 Fix-opening-of-new-tabs-with-multiple-processes.patch
 Allow-ANSI-string-terminator-to-work.patch
 Update-release-date-scripting-and-command-line-help.patch
+Add-check-for-valid-container-possible-crash-fix.patch

-- 
konsole packaging