Merge branch 'stable-1.1'

2014-12-22 14:36:54 +02:00
parent dd053b99d2 25ab7260f5
commit 6a89615d33
7 changed files with 155 additions and 16 deletions
--- a/src/core/Controller.cpp
+++ b/src/core/Controller.cpp
@@ -205,8 +205,11 @@ Controller * Controller::create( ControllerTypes _ct, Model * _parent )
 			if( dummy )
 				c = dummy;
 			else
+			{
 				c = new Controller( DummyController, NULL,
 								QString() );
+				dummy = c;
+			}
 			break;

 		case Controller::LfoController: