Simplify the DCLP singleton instances found by searching for methods named 'getInstance'.

2015-11-28 12:31:43 +01:00
parent f77ca41a6f
commit 9ec0557edf
6 changed files with 12 additions and 69 deletions
--- a/rtgui/extprog.cc
+++ b/rtgui/extprog.cc
@@ -74,18 +74,8 @@ bool ExtProgAction::Execute(std::vector<Glib::ustring> fileNames)
 // Generates as singleton
 ExtProgStore* ExtProgStore::getInstance()
 {
-    static ExtProgStore* instance_ = 0;
-
-    if ( instance_ == 0 ) {
-        static MyMutex smutex_;
-        MyMutex::MyLock lock(smutex_);
-
-        if ( instance_ == 0 ) {
-            instance_ = new ExtProgStore();
-        }
-    }
-
-    return instance_;
+    static ExtProgStore instance_;
+    return &instance_;
 }

 ExtProgStore::~ExtProgStore()