Merge branch 'master' into gtk3

2015-12-01 18:59:59 +01:00
parent 72acf67304 e85da94b8e
commit 2e720bdeb8
34 changed files with 89 additions and 138 deletions
--- a/rtgui/previewloader.cc
+++ b/rtgui/previewloader.cc
@@ -169,19 +169,8 @@ PreviewLoader::PreviewLoader():

 PreviewLoader* PreviewLoader::getInstance(void)
 {
-    // this will not be deleted...
-    static PreviewLoader* instance_ = NULL;
-
-    if ( instance_ == NULL ) {
-        static MyMutex smutex_;
-        MyMutex::MyLock lock(smutex_);
-
-        if ( instance_ == NULL ) {
-            instance_ = new PreviewLoader();
-        }
-    }
-
-    return instance_;
+    static PreviewLoader instance_;
+    return &instance_;
 }

 void PreviewLoader::add(int dir_id, const Glib::ustring& dir_entry, PreviewLoaderListener* l)