mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-08 14:53:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2048 from Wallacoloo/issue-2015-4

Browse Source 
Reorder Editor/Song destruction order to prevent bad memory accesses
This commit is contained in:
Dave
2015-06-13 11:37:22 +01:00
parent 6c934d6aae 12f299bb9e
commit 979fa2fb93
3 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/GuiApplication.h
View File

@@ -61,6 +61,9 @@ public:
public slots:
void displayInitProgress(const QString &msg);
private slots:
void childDestroyed(QObject *obj);
private:
static GuiApplication* s_instance;

52
src/gui/GuiApplication.cpp
View File

@@ -97,23 +97,37 @@ GuiApplication::GuiApplication()
displayInitProgress(tr("Preparing UI"));
m_mainWindow = new MainWindow;
connect(m_mainWindow, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*)));
connect(m_mainWindow, SIGNAL(initProgress(const QString&)),
this, SLOT(displayInitProgress(const QString&)));
displayInitProgress(tr("Preparing song editor"));
m_songEditor = new SongEditorWindow(Engine::getSong());
connect(m_songEditor, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*)));
displayInitProgress(tr("Preparing mixer"));
m_fxMixerView = new FxMixerView;
connect(m_fxMixerView, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*)));
displayInitProgress(tr("Preparing controller rack"));
m_controllerRackView = new ControllerRackView;
connect(m_controllerRackView, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*)));
displayInitProgress(tr("Preparing project notes"));
m_projectNotes = new ProjectNotes;
connect(m_projectNotes, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*)));
displayInitProgress(tr("Preparing beat/bassline editor"));
m_bbEditor = new BBEditor(Engine::getBBTrackContainer());
connect(m_bbEditor, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*)));
displayInitProgress(tr("Preparing piano roll"));
m_pianoRoll = new PianoRollWindow();
connect(m_pianoRoll, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*)));
displayInitProgress(tr("Preparing automation editor"));
m_automationEditor = new AutomationEditorWindow;
connect(m_automationEditor, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*)));
m_mainWindow->finalize();
splashScreen.finish(m_mainWindow);
@@ -137,3 +151,41 @@ void GuiApplication::displayInitProgress(const QString &msg)
m_loadingProgressLabel->repaint();
qApp->processEvents();
}
void GuiApplication::childDestroyed(QObject *obj)
{
// when any object that can be reached via gui->mainWindow(), gui->fxMixerView(), etc
// is destroyed, ensure that their accessor functions will return null instead of a garbage pointer.
if (obj == m_mainWindow)
{
m_mainWindow = nullptr;
}
else if (obj == m_fxMixerView)
{
m_fxMixerView = nullptr;
}
else if (obj == m_songEditor)
{
m_songEditor = nullptr;
}
else if (obj == m_automationEditor)
{
m_automationEditor = nullptr;
}
else if (obj == m_bbEditor)
{
m_bbEditor = nullptr;
}
else if (obj == m_pianoRoll)
{
m_pianoRoll = nullptr;
}
else if (obj == m_projectNotes)
{
m_projectNotes = nullptr;
}
else if (obj == m_controllerRackView)
{
m_controllerRackView = nullptr;
}
}

5
src/gui/MainWindow.cpp
View File

@@ -216,6 +216,11 @@ MainWindow::~MainWindow()
delete view;
}
// TODO: Close tools
// dependencies are such that the editors must be destroyed BEFORE Song is deletect in Engine::destroy
// see issue #2015 on github
delete gui->automationEditor();
delete gui->pianoRoll();
delete gui->songEditor();
// destroy engine which will do further cleanups etc.
Engine::destroy();
}