From 9cf0f4932a40f87032b086b4e6dc1e3997a806b3 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 16 Aug 2010 20:28:53 +0200 Subject: [PATCH] Song: reset global models in clearProject() We have to reset global models such as tempo, master volume etc. before clearing the global automation patterns attached to them. Fixes bug with persistent automation on these controls when clearing project. Closes #3046039. (cherry picked from commit 2614474246d4c4768f72012c9b5e42207df8378a) --- src/core/song.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/core/song.cpp b/src/core/song.cpp index cc99d3c20..551b643b3 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -749,6 +749,11 @@ void song::clearProject() engine::automationEditor()->setCurrentPattern( NULL ); } + m_tempoModel.reset(); + m_masterVolumeModel.reset(); + m_masterPitchModel.reset(); + m_timeSigModel.reset(); + AutomationPattern::globalAutomationPattern( &m_tempoModel )->clear(); AutomationPattern::globalAutomationPattern( &m_masterVolumeModel )-> clear();