From c748064d0aaeff210211b55cd8dcb9682ce2247f Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Sat, 11 Nov 2023 17:59:31 +0100 Subject: [PATCH] Make _applicationOverlay a shared_ptr --- interface/src/Application.cpp | 1 + interface/src/Application.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 9a39811c28..482539b8e8 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1049,6 +1049,7 @@ void Application::initialize(const QCommandLineParser &parser) { _octreeProcessor = std::make_shared(); _entityEditSender = std::make_shared(); _graphicsEngine = std::make_shared(); + _applicationOverlay = std::make_shared(); diff --git a/interface/src/Application.h b/interface/src/Application.h index e848e5e100..69d167d27b 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -217,8 +217,8 @@ public: ivec2 getMouse() const; - ApplicationOverlay& getApplicationOverlay() { return _applicationOverlay; } - const ApplicationOverlay& getApplicationOverlay() const { return _applicationOverlay; } + ApplicationOverlay& getApplicationOverlay() { return *_applicationOverlay; } + const ApplicationOverlay& getApplicationOverlay() const { return *_applicationOverlay; } CompositorHelper& getApplicationCompositor() const; Overlays& getOverlays() { return _overlays; } @@ -775,7 +775,7 @@ private: bool _disableLoginScreen { true }; Overlays _overlays; - ApplicationOverlay _applicationOverlay; + std::shared_ptr _applicationOverlay; OverlayConductor _overlayConductor; DialogsManagerScriptingInterface* _dialogsManagerScriptingInterface = new DialogsManagerScriptingInterface();