From eaaae54e10aaeefc3ffb70592b2a2bf7dad644df Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 2 Oct 2012 16:52:30 +0200 Subject: [PATCH] Make sure to save settings when closing managers This is needed to catch any updates that were triggered during tear down of the UI (which happens after the saveSettings signal was emitted). Change-Id: I9f14e8807070f3192551a3653bad31072db539f5 Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/kitmanager.cpp | 1 + src/plugins/projectexplorer/toolchainmanager.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index b5093acc26f..ef174b7b9cc 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/src/plugins/projectexplorer/kitmanager.cpp @@ -221,6 +221,7 @@ void KitManager::restoreKits() KitManager::~KitManager() { + saveKits(); // Make sure we save the current state on exit! // Clean out kit information to avoid calling them during deregistration: delete d; m_instance = 0; diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index 0177ab1091f..a40ab26ab76 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -203,6 +203,8 @@ void ToolChainManager::restoreToolChains() ToolChainManager::~ToolChainManager() { + saveToolChains(); // Make sure to save tool chains when closing + // Deregister tool chains QList copy = d->toolChains(); foreach (ToolChain *tc, copy)