diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2012-12-19 16:02:47 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2012-12-19 16:54:22 +0100 |
| commit | 1bff9f82db34a096415ee212d0f8e977977d1536 (patch) | |
| tree | 484c5747e44768cff4f36cf7a172ab338e220811 /src | |
| parent | c708944af9a572d94c937cda301cfc879d29c7ae (diff) | |
Devicemanager: Do not ruin device settings when closing optionspage
Change-Id: I3684422f9d41eba3bda8532c58242eca7edef67b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/projectexplorer/devicesupport/devicemanager.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp index bd4c4cf6bc5..fe2b638eeaf 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp @@ -135,6 +135,8 @@ void DeviceManager::copy(const DeviceManager *source, DeviceManager *target, boo void DeviceManager::save() { + if (d->clonedInstance == this) + return; QVariantMap data; data.insert(QLatin1String(DeviceManagerKey), toMap()); d->writer->save(data, Core::ICore::mainWindow()); @@ -342,7 +344,8 @@ DeviceManager::DeviceManager(bool isInstance) : d(new DeviceManagerPrivate) DeviceManager::~DeviceManager() { - delete d->writer; + if (d->clonedInstance != this) + delete d->writer; delete d; } |