From 54c1359d1fc1d55a7cd55e745ab5a993e42ad6f2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 22 Sep 2019 02:38:59 +0200 Subject: [PATCH] Add precondition checks to Do{Get,Set}ClientSize() Don't crash if these methods are called before the window is created. --- src/qt/window.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qt/window.cpp b/src/qt/window.cpp index 21d9b6f1ab..2530a016cf 100644 --- a/src/qt/window.cpp +++ b/src/qt/window.cpp @@ -975,6 +975,8 @@ void wxWindowQt::DoSetSize(int x, int y, int width, int height, int sizeFlags ) void wxWindowQt::DoGetClientSize(int *width, int *height) const { QWidget *qtWidget = QtGetClientWidget(); + wxCHECK_RET( qtWidget, "window must be created" ); + const QRect geometry = qtWidget->geometry(); if (width) *width = geometry.width(); if (height) *height = geometry.height(); @@ -984,6 +986,8 @@ void wxWindowQt::DoGetClientSize(int *width, int *height) const void wxWindowQt::DoSetClientSize(int width, int height) { QWidget *qtWidget = QtGetClientWidget(); + wxCHECK_RET( qtWidget, "window must be created" ); + QRect geometry = qtWidget->geometry(); geometry.setWidth( width ); geometry.setHeight( height );