Merge pull request #5745 from johnhaddon/staticSignalsLifetime

GafferUI : Fix crashes during shutdown
GafferHQ · Mar 22, 2024 · 6711b32 · 6711b32
2 parents 6635b5e + f281f4d
commit 6711b32
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Changes.md b/Changes.md
@@ -26,6 +26,7 @@ Fixes
 - ImageReader :
   - Fixed loading of OpenEXR images with 32 bit float data and DWA compression [^1].
   - Fixed loading of secondary layers in OpenEXR images with DWA compression [^1].
+- GUI : Fixed potential crashes during shutdown [^1].
 
 API
 ---

diff --git a/src/GafferUI/PlugAdder.cpp b/src/GafferUI/PlugAdder.cpp
@@ -203,14 +203,14 @@ void PlugAdder::updateDragEndPoint( const Imath::V3f position, const Imath::V3f
 
 PlugAdder::PlugMenuSignal &PlugAdder::plugMenuSignal()
 {
-	static PlugMenuSignal s;
-	return s;
+	static PlugMenuSignal *s = new PlugMenuSignal;
+	return *s;
 }
 
 PlugAdder::MenuSignal &PlugAdder::menuSignal()
 {
-	static MenuSignal s;
-	return s;
+	static MenuSignal *s = new MenuSignal;
+	return *s;
 }
 
 void PlugAdder::renderLayer( Layer layer, const Style *style, RenderReason reason ) const

diff --git a/src/GafferUI/Pointer.cpp b/src/GafferUI/Pointer.cpp
@@ -146,6 +146,6 @@ void Pointer::registerPointer( const std::string &name, ConstPointerPtr pointer
 
 Pointer::ChangedSignal &Pointer::changedSignal()
 {
-	static ChangedSignal s;
-	return s;
+	static ChangedSignal *s = new ChangedSignal;
+	return *s;
 }