From 71d35aa75f32ba2006e1116bc1fc53a59093bfc3 Mon Sep 17 00:00:00 2001 From: Maximilian Seidler <78690852+PaideiaDilemma@users.noreply.github.com> Date: Thu, 10 Apr 2025 09:36:54 +0200 Subject: [PATCH] image: remove left over raw pointer to COutput (#735) --- src/renderer/widgets/Image.cpp | 5 +++-- src/renderer/widgets/Image.hpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/renderer/widgets/Image.cpp b/src/renderer/widgets/Image.cpp index b9977dc..9b19f6d 100644 --- a/src/renderer/widgets/Image.cpp +++ b/src/renderer/widgets/Image.cpp @@ -78,7 +78,8 @@ void CImage::plantTimer() { void CImage::configure(const std::unordered_map& props, const SP& pOutput) { reset(); - viewport = pOutput->getViewport(); + viewport = pOutput->getViewport(); + stringPort = pOutput->stringPort; shadow.configure(m_self.lock(), props, viewport); @@ -230,5 +231,5 @@ void CImage::renderUpdate() { g_pHyprlock->addTimer(std::chrono::milliseconds(100), [REF = m_self](auto, auto) { onAssetCallback(REF); }, nullptr); } - g_pHyprlock->renderOutput(output->stringPort); + g_pHyprlock->renderOutput(stringPort); } diff --git a/src/renderer/widgets/Image.hpp b/src/renderer/widgets/Image.hpp index 24e8a9f..16e04b8 100644 --- a/src/renderer/widgets/Image.hpp +++ b/src/renderer/widgets/Image.hpp @@ -54,9 +54,10 @@ class CImage : public IWidget { CAsyncResourceGatherer::SPreloadRequest request; Vector2D viewport; + std::string stringPort; + std::string resourceID; std::string pendingResourceID; // if reloading image - SPreloadedAsset* asset = nullptr; - COutput* output = nullptr; + SPreloadedAsset* asset = nullptr; CShadowable shadow; };