Squashed commit of the topic/exceptions branch.

Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)

1 files changed, 8 insertions, 4 deletions

diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index b324441..1650526 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -217,6 +217,11 @@ QConfFile::QConfFile(const QString &fileName, bool _userPerms)
     usedHashFunc()->insert(name, this);
 }
 
+QConfFile::~QConfFile()
+{
+    usedHashFunc()->remove(name);
+}
+
 ParsedSettingsMap QConfFile::mergedKeyMap() const
 {
     ParsedSettingsMap result = originalKeys;
@@ -263,7 +268,7 @@ QConfFile *QConfFile::fromName(const QString &fileName, bool _userPerms)
     ConfFileHash *usedHash = usedHashFunc();
     ConfFileCache *unusedCache = unusedCacheFunc();
 
-    QConfFile *confFile;
+    QConfFile *confFile = 0;
     QMutexLocker locker(globalMutex());
 
     if (!(confFile = usedHash->value(absPath))) {
@@ -1232,12 +1237,11 @@ QConfFileSettingsPrivate::~QConfFileSettingsPrivate()
 
     for (int i = 0; i < NumConfFiles; ++i) {
         if (confFiles[i] && !confFiles[i]->ref.deref()) {
-            if (usedHash)
-                usedHash->remove(confFiles[i]->name);
-
             if (confFiles[i]->size == 0) {
                 delete confFiles[i].take();
             } else if (unusedCache) {
+                if (usedHash)
+                    usedHash->remove(confFiles[i]->name);
                 QT_TRY {
                     // compute a better size?
                     unusedCache->insert(confFiles[i]->name, confFiles[i].data(),