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

List:       kde-commits
Subject:    [krita/rempt/impex-refactoring] plugins/dockers/compositiondocker: Fix double initialization of acti
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2016-12-08 11:23:05
Message-ID: E1cEwn3-0007ne-Rl () code ! kde ! org
[Download RAW message or body]

Git commit 5ce167b6194eb40a437314f48d1ed54ce8c7f81c by Dmitry Kazakov.
Committed on 08/12/2016 at 11:01.
Pushed by dkazakov into branch 'rempt/impex-refactoring'.

Fix double initialization of actions in the action manager

M  +4    -4    plugins/dockers/compositiondocker/compositiondocker_dock.cpp

https://commits.kde.org/krita/5ce167b6194eb40a437314f48d1ed54ce8c7f81c

diff --git a/plugins/dockers/compositiondocker/compositiondocker_dock.cpp \
b/plugins/dockers/compositiondocker/compositiondocker_dock.cpp index \
                263c0cf5b4d..cc20c8eaeeb 100644
--- a/plugins/dockers/compositiondocker/compositiondocker_dock.cpp
+++ b/plugins/dockers/compositiondocker/compositiondocker_dock.cpp
@@ -108,10 +108,10 @@ void CompositionDockerDock::setCanvas(KoCanvasBase * canvas)
             KisAction *renameAction = \
                m_canvas->viewManager()->actionManager()->createAction("rename_composition");
                
             connect(renameAction, SIGNAL(triggered()), this, \
SLOT(renameComposition()));  m_actions.append(renameAction);
-        }
-
-        Q_FOREACH (KisAction *action, m_actions) {
-            m_canvas->viewManager()->actionManager()->addAction(action->objectName(), \
action); +        } else {
+            Q_FOREACH (KisAction *action, m_actions) {
+                m_canvas->viewManager()->actionManager()->addAction(action->objectName(), \
action); +            }
         }
         updateModel();
     }


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