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

List:       kde-commits
Subject:    [krita/rempt/impex-refactoring] libs/image: Fix KisImageTest
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2016-10-01 19:29:11
Message-ID: E1bqPyB-0006mg-CQ () code ! kde ! org
[Download RAW message or body]

Git commit 85e4ff1f9b1b4ff7998d4f5043ec786fc9d8580c by Dmitry Kazakov.
Committed on 01/10/2016 at 19:28.
Pushed by dkazakov into branch 'rempt/impex-refactoring'.

Fix KisImageTest

Sometimes the user might pass null pointer which causes a crash

M  +4    -0    libs/image/kis_layer_utils.cpp

http://commits.kde.org/krita/85e4ff1f9b1b4ff7998d4f5043ec786fc9d8580c

diff --git a/libs/image/kis_layer_utils.cpp b/libs/image/kis_layer_utils.cpp
index d3e4e89..db5dbff 100644
--- a/libs/image/kis_layer_utils.cpp
+++ b/libs/image/kis_layer_utils.cpp
@@ -995,6 +995,10 @@ namespace KisLayerUtils {
                                            bool flattenSingleLayer, const \
                KUndo2MagicString &actionName, 
                                            bool cleanupNodes = true, const QString \
layerName = QString())  {
+        if (!putAfter) {
+            putAfter = mergedNodes.first();
+        }
+
         filterMergableNodes(mergedNodes);
         {
             KisNodeList tempNodes;


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