From 92a551b96e625257def26771155ebd64c6d8757e Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 29 Jun 2014 00:06:23 +0000 Subject: fixed not working singletons - still not threadsafe but at least they don't pretend to be --- src/signalController.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/signalController.cpp') diff --git a/src/signalController.cpp b/src/signalController.cpp index f4ae059..b9e2f25 100644 --- a/src/signalController.cpp +++ b/src/signalController.cpp @@ -39,19 +39,13 @@ #include "anytunError.h" #include "threadUtils.hpp" -SignalController* SignalController::inst = NULL; -Mutex SignalController::instMutex; + SignalController& gSignalController = SignalController::instance(); SignalController& SignalController::instance() { - Lock lock(instMutex); - static instanceCleaner c; - if(!inst) { - inst = new SignalController(); - } - - return *inst; + static SignalController instance; + return instance; } int SigErrorHandler(int /*sig*/, const std::string& msg) -- cgit v1.2.3