Merge with b989fba4c24c34873648df6871da4d0d8cb0a6d1

2014-02-06 20:51:21 +01:00
parent d8e5bc8bd9
commit 6398f6bf66
86 changed files with 3159 additions and 2519 deletions
--- a/rtgui/profilestore.cc
+++ b/rtgui/profilestore.cc
@@ -46,6 +46,9 @@ bool ProfileStore::init () {

 ProfileStore::~ProfileStore () {

+    if (storeState == STORESTATE_NOTINITIALIZED)
+        return;
+
    // This lock prevent object's suppression while scanning the directories
    storeState = STORESTATE_DELETED;
    MyMutex::MyLock lock(*parseMutex);