From beb3916858dcf5fa2fe0d9d98013fa8190497826 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 27 Jul 2020 06:17:26 +0200 Subject: [PATCH] Windows QPA: Potential crash fix for Wine Add a check for theme instance. Pick-to: 5.15 Fixes: QTBUG-85734 Change-Id: I10aced73379cd5e0b49d5cee08ceead060397a54 Reviewed-by: Oliver Wolff --- src/plugins/platforms/windows/qwindowsscreen.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp index 34e9e8fe31..a15a39c2a4 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.cpp +++ b/src/plugins/platforms/windows/qwindowsscreen.cpp @@ -569,8 +569,10 @@ bool QWindowsScreenManager::handleScreenChanges() removeScreen(i); } // for existing screens } // not lock screen - if (primaryScreenChanged) - QWindowsTheme::instance()->refreshFonts(); + if (primaryScreenChanged) { + if (auto theme = QWindowsTheme::instance()) // QTBUG-85734/Wine + theme->refreshFonts(); + } QHighDpiScaling::updateHighDpiScaling(); return true; }