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

Debugger: Fix crash in debuggeritemmanager on Windows

Browse Source 
Change-Id: I777fb4ad5de6f10c45443df7898602b98adc5e7a
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2017-01-17 09:12:36 +01:00
parent 9a05ac8e1a
commit 825c84181a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/debuggeritemmanager.cpp
View File

@@ -99,7 +99,7 @@ public:
IOptionsPage *m_optionsPage = 0; IOptionsPage *m_optionsPage = 0;
}; };
DebuggerItemManagerPrivate *d; static DebuggerItemManagerPrivate *d = 0;
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// DebuggerItemConfigWidget // DebuggerItemConfigWidget
@@ -624,7 +624,7 @@ void DebuggerOptionsPage::finish()
DebuggerItemManager::DebuggerItemManager() DebuggerItemManager::DebuggerItemManager()
{ {
d = new DebuggerItemManagerPrivate; new DebuggerItemManagerPrivate;
connect(ICore::instance(), &ICore::saveSettingsRequested, connect(ICore::instance(), &ICore::saveSettingsRequested,
this, [] { d->saveDebuggers(); }); this, [] { d->saveDebuggers(); });
} }
@@ -864,6 +864,7 @@ static FileName userSettingsFileName()
DebuggerItemManagerPrivate::DebuggerItemManagerPrivate() DebuggerItemManagerPrivate::DebuggerItemManagerPrivate()
: m_writer(userSettingsFileName(), "QtCreatorDebuggers") : m_writer(userSettingsFileName(), "QtCreatorDebuggers")
{ {
d = this;
m_model = new DebuggerItemModel; m_model = new DebuggerItemModel;
m_optionsPage = new DebuggerOptionsPage; m_optionsPage = new DebuggerOptionsPage;
ExtensionSystem::PluginManager::addObject(m_optionsPage); ExtensionSystem::PluginManager::addObject(m_optionsPage);