diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-27 06:17:26 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-27 11:30:12 +0200 |
| commit | beb3916858dcf5fa2fe0d9d98013fa8190497826 (patch) | |
| tree | bd149a60414fbd59cc174e0a13095ec9dfaeefb4 /src | |
| parent | 37649b0942748f668320d4a151d733d0d8d1dbd9 (diff) | |
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 <oliver.wolff@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsscreen.cpp | 6 |
1 files 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; } |