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/thumbimageupdater.cc
+++ b/rtgui/thumbimageupdater.cc
@@ -175,14 +175,8 @@ public:
 ThumbImageUpdater*
 ThumbImageUpdater::getInstance(void)
 {
-    // this will not be deleted...
-    static ThumbImageUpdater* instance_ = 0;
-
-    if ( instance_ == 0 ) {
-        instance_ = new ThumbImageUpdater();
-    }
-
-    return instance_;
+    static ThumbImageUpdater instance_;
+    return &instance_;
 }

 ThumbImageUpdater::ThumbImageUpdater():