Fix some issues in safe OpenGL renderer after last changes.

4 files changed, 19 insertions, 0 deletions

diff --git a/src/gui/windows/connectiondialog.cpp b/src/gui/windows/connectiondialog.cpp
index bdbd6af69..a01d7e353 100644
--- a/src/gui/windows/connectiondialog.cpp
+++ b/src/gui/windows/connectiondialog.cpp
@@ -80,3 +80,11 @@ void ConnectionDialog::draw(Graphics *graphics)
     drawChildren(graphics);
     BLOCK_END("ConnectionDialog::draw")
 }
+
+void ConnectionDialog::safeDraw(Graphics *graphics)
+{
+    BLOCK_START("ConnectionDialog::draw")
+    // Don't draw the window background, only draw the children
+    drawChildren(graphics);
+    BLOCK_END("ConnectionDialog::draw")
+}
diff --git a/src/gui/windows/connectiondialog.h b/src/gui/windows/connectiondialog.h
index 39c802c3a..6fdeeff00 100644
--- a/src/gui/windows/connectiondialog.h
+++ b/src/gui/windows/connectiondialog.h
@@ -60,6 +60,8 @@ class ConnectionDialog final : public Window,
 
         void draw(Graphics *graphics) override final;
 
+        void safeDraw(Graphics *graphics) override final;
+
     private:
         State mCancelState;
 };
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index 27dfc3d75..7341094aa 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -319,6 +319,13 @@ void MiniStatusWindow::draw(Graphics *graphics)
     BLOCK_END("MiniStatusWindow::draw")
 }
 
+void MiniStatusWindow::safeDraw(Graphics *graphics)
+{
+    BLOCK_START("MiniStatusWindow::draw")
+    drawChildren(graphics);
+    BLOCK_END("MiniStatusWindow::draw")
+}
+
 void MiniStatusWindow::mouseMoved(MouseEvent &event)
 {
     Window::mouseMoved(event);
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index 923e74696..8d46fbdf9 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -71,6 +71,8 @@ class MiniStatusWindow final : public Window,
 
         void draw(Graphics *graphics) override final;
 
+        void safeDraw(Graphics *graphics) override final;
+
         void mouseMoved(MouseEvent &event) override final;
 
         void mousePressed(MouseEvent &event) override final;