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

Devicemanager: Do not ruin device settings when closing optionspage

Browse Source 
Change-Id: I3684422f9d41eba3bda8532c58242eca7edef67b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Tobias Hunger
2012-12-19 16:02:47 +01:00
parent c708944af9
commit 1bff9f82db
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/devicesupport/devicemanager.cpp
View File

@@ -135,6 +135,8 @@ void DeviceManager::copy(const DeviceManager *source, DeviceManager *target, boo
void DeviceManager::save() void DeviceManager::save()
{ {
if (d->clonedInstance == this)
return;
QVariantMap data; QVariantMap data;
data.insert(QLatin1String(DeviceManagerKey), toMap()); data.insert(QLatin1String(DeviceManagerKey), toMap());
d->writer->save(data, Core::ICore::mainWindow()); d->writer->save(data, Core::ICore::mainWindow());
@@ -342,7 +344,8 @@ DeviceManager::DeviceManager(bool isInstance) : d(new DeviceManagerPrivate)
DeviceManager::~DeviceManager() DeviceManager::~DeviceManager()
{ {
delete d->writer; if (d->clonedInstance != this)
delete d->writer;
delete d; delete d;
} }