From ab8be73047ecb15026ecd074471b6ca4137bd7cd Mon Sep 17 00:00:00 2001
From: Johannes Lorenz <j.git@lorenz-ho.me>
Date: Sun, 8 Mar 2020 08:24:46 +0100
Subject: [PATCH] Cherry-pick from master commit 4dc26d1 (#5413)

---
 src/core/Song.cpp             | 2 ++
 src/gui/editors/PianoRoll.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/core/Song.cpp b/src/core/Song.cpp
index 54f19e1d3..3285497a8 100644
--- a/src/core/Song.cpp
+++ b/src/core/Song.cpp
@@ -75,6 +75,7 @@ Song::Song() :
 	m_oldTicksPerTact( DefaultTicksPerTact ),
 	m_masterVolumeModel( 100, 0, 200, this, tr( "Master volume" ) ),
 	m_masterPitchModel( 0, -12, 12, this, tr( "Master pitch" ) ),
+	m_nLoadingTrack( 0 ),
 	m_fileName(),
 	m_oldFileName(),
 	m_modified( false ),
@@ -85,6 +86,7 @@ Song::Song() :
 	m_renderBetweenMarkers( false ),
 	m_playing( false ),
 	m_paused( false ),
+	m_savingProject( false ),
 	m_loadingProject( false ),
 	m_isCancelled( false ),
 	m_playMode( Mode_None ),
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index f6bda682b..924463995 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -154,6 +154,8 @@ PianoRoll::PianoRoll() :
 	m_zoomingModel(),
 	m_quantizeModel(),
 	m_noteLenModel(),
+	m_scaleModel(),
+	m_chordModel(),
 	m_pattern( NULL ),
 	m_currentPosition(),
 	m_recording( false ),