diff --git a/src_main/core/picout.cpp b/src_main/core/picout.cpp index 8e48ca4f..55d6cbbd 100644 --- a/src_main/core/picout.cpp +++ b/src_main/core/picout.cpp @@ -80,8 +80,8 @@ PICout::Notifier::Notifier() { PICout::Notifier * PICout::Notifier::instance() { - static PICout::Notifier ret; - return &ret; + static PICout::Notifier * ret = new PICout::Notifier(); + return ret; } @@ -94,8 +94,8 @@ PIObject * PICout::Notifier::object() { using namespace PICoutManipulators; -PIMutex & PICout::__mutex__() {static PIMutex ret; return ret;} -PIString & PICout::__string__() {static PIString ret; return ret;} +PIMutex & PICout::__mutex__() {static PIMutex * ret = new PIMutex(); return *ret;} +PIString & PICout::__string__() {static PIString * ret = new PIString(); return *ret;} PICout::OutputDevices PICout::devs = PICout::StdOut;