Commit de9c2d3b authored by Maurice Kalinowski's avatar Maurice Kalinowski Committed by Tobias Hunger
Browse files

Fix potential startup crashes



Change-Id: Id0f03b4fa9ff6a8f0f5b0de11fe51c3729065140
Reviewed-by: Tobias Hunger's avatarTobias Hunger <tobias.hunger@qt.io>
parent e2eb591c
......@@ -106,12 +106,14 @@ void Find::destroy()
{
delete m_instance;
m_instance = 0;
delete d->m_currentDocumentFind;
delete d->m_findToolBar;
delete d->m_findDialog;
ExtensionSystem::PluginManager::removeObject(d->m_searchResultWindow);
delete d->m_searchResultWindow;
delete d;
if (d) {
delete d->m_currentDocumentFind;
delete d->m_findToolBar;
delete d->m_findDialog;
ExtensionSystem::PluginManager::removeObject(d->m_searchResultWindow);
delete d->m_searchResultWindow;
delete d;
}
}
Find *Find::instance()
......
......@@ -331,11 +331,11 @@ public:
QAction *m_projectSelectorActionQuick;
QAction *m_runSubProject;
ProjectWindow *m_proWindow;
ProjectWindow *m_proWindow = nullptr;
QString m_sessionToRestoreAtStartup;
QStringList m_profileMimeTypes;
AppOutputPane *m_outputPane;
AppOutputPane *m_outputPane = nullptr;
QList<QPair<QString, QString> > m_recentProjects; // pair of filename, displayname
static const int m_maxRecentProjects = 25;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment