From 3a3af4ce6b35daa97327cc3427cc0c93b483f4fb Mon Sep 17 00:00:00 2001
From: "Raine M. Ekman" <raine@iki.fi>
Date: Sun, 22 Nov 2015 21:43:00 +0200
Subject: [PATCH] Don't remove controller just to be sure before adding it in
 Song::restoreControllerStates, Song::addController handles double adds. Fixes
 #2318

---
 src/core/Song.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/core/Song.cpp b/src/core/Song.cpp
index 1106484d7..69694576f 100644
--- a/src/core/Song.cpp
+++ b/src/core/Song.cpp
@@ -1198,12 +1198,6 @@ void Song::restoreControllerStates( const QDomElement & element )
 		Controller * c = Controller::create( node.toElement(), this );
 		Q_ASSERT( c != NULL );
 
-		/* For PeakController, addController() was called in
-		 * PeakControllerEffect::PeakControllerEffect().
-		 * This line removes the previously added controller for PeakController
-		 * without affecting the order of controllers in Controller Rack
-		 */
-		Engine::getSong()->removeController( c );
 		addController( c );
 
 		node = node.nextSibling();