f

etorth · Dec 13, 2023 · 34c2c76 · 34c2c76
1 parent 19c946d
commit 34c2c76
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/client/src/sdldevice.cpp b/client/src/sdldevice.cpp
@@ -64,8 +64,11 @@ SDLDeviceHelper::EnableRenderBlendMode::~EnableRenderBlendMode()
 
 SDLDeviceHelper::EnableRenderClipRectangle::EnableRenderClipRectangle(int x, int y, int w, int h, SDLDevice *devPtr)
     : m_device(devPtr ? devPtr : g_sdlDevice)
+    , m_clipped(SDL_RenderIsClipEnabled(m_device->getRenderer()) == SDL_TRUE)
 {
-    SDL_RenderGetClipRect(m_device->getRenderer(), &m_rect);
+    if(m_clipped){
+        SDL_RenderGetClipRect(m_device->getRenderer(), &m_rect);
+    }
 
     SDL_Rect newRect;
     newRect.x = x;
@@ -80,7 +83,7 @@ SDLDeviceHelper::EnableRenderClipRectangle::EnableRenderClipRectangle(int x, int
 
 SDLDeviceHelper::EnableRenderClipRectangle::~EnableRenderClipRectangle()
 {
-    if(SDL_RenderSetClipRect(m_device->getRenderer(), &m_rect)){
+    if(SDL_RenderSetClipRect(m_device->getRenderer(), m_clipped ? &m_rect : nullptr)){
         g_log->addLog(LOGTYPE_WARNING, "set renderer clip rectangle failed: %s", SDL_GetError());
     }
 }

diff --git a/client/src/sdldevice.hpp b/client/src/sdldevice.hpp
@@ -51,6 +51,9 @@ namespace SDLDeviceHelper
         private:
             SDLDevice *m_device;
 
+        private:
+            const bool m_clipped;
+
         private:
             SDL_Rect m_rect;