feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix potential startup crashes

Browse Source 
Change-Id: Id0f03b4fa9ff6a8f0f5b0de11fe51c3729065140
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Maurice Kalinowski
2016-12-02 09:50:14 +01:00
committed by Tobias Hunger
parent e2eb591c4c
commit de9c2d3bf0
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/coreplugin/find/findplugin.cpp
View File

@@ -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()

4
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -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;