Fix lost control links in copied automation patterns (#4723)

This hack should be removed once the automation system gets fixed.
LMMS · Dec 22, 2018 · e1d9d89 · e1d9d89
1 parent 642b5e7
commit e1d9d89
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/include/ProjectJournal.h b/include/ProjectJournal.h
@@ -77,6 +77,7 @@ class ProjectJournal
 	}
 
 	static jo_id_t idToSave( jo_id_t id );
+	static jo_id_t idFromSave( jo_id_t id );
 
 	void clearJournal();
 	void stopAllJournalling();

diff --git a/src/core/AutomationPattern.cpp b/src/core/AutomationPattern.cpp
@@ -787,6 +787,16 @@ void AutomationPattern::resolveAllIDs()
 						{
 							a->addObject( dynamic_cast<AutomatableModel *>( o ), false );
 						}
+						else
+						{
+							// FIXME: Remove this block once the automation system gets fixed
+							// This is a temporary fix for https://github.com/LMMS/lmms/issues/3781
+							o = Engine::projectJournal()->journallingObject(ProjectJournal::idFromSave(*k));
+							if( o && dynamic_cast<AutomatableModel *>( o ) )
+							{
+								a->addObject( dynamic_cast<AutomatableModel *>( o ), false );
+							}
+						}
 					}
 					a->m_idsToResolve.clear();
 					a->dataChanged();

diff --git a/src/core/ProjectJournal.cpp b/src/core/ProjectJournal.cpp
@@ -164,6 +164,11 @@ jo_id_t ProjectJournal::idToSave( jo_id_t id )
 	return id & ~EO_ID_MSB;
 }
 
+jo_id_t ProjectJournal::idFromSave( jo_id_t id )
+{
+	return id | EO_ID_MSB;
+}
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -164,6 +164,11 @@ jo_id_t ProjectJournal::idToSave( jo_id_t id ) @@
     	return id & ~EO_ID_MSB;
     }
+    jo_id_t ProjectJournal::idFromSave( jo_id_t id )
+    {
+    	return id | EO_ID_MSB;
+    }
@@ Expand Down @@