From 1bff9f82db34a096415ee212d0f8e977977d1536 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 19 Dec 2012 16:02:47 +0100 Subject: [PATCH] Devicemanager: Do not ruin device settings when closing optionspage Change-Id: I3684422f9d41eba3bda8532c58242eca7edef67b Reviewed-by: Orgad Shaneh Reviewed-by: Eike Ziller --- src/plugins/projectexplorer/devicesupport/devicemanager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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; }