alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crash when QGuiApplication::primaryScreen() returns a null pointer

Browse Source 
There can be a situation when changing resolution/scaling or some other screen
property that driver/XRandR decides to turn the screen off temporarily, during
which there are no screens and QGuiApplication::primaryScreen returns a null
pointer.

Approved-by: David Edmundson
This commit is contained in:
Dan Vrátil 2015-06-06 16:05:34 +02:00
parent e235affc6b
commit afd962a15b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/declarativeimports/core/units.cpp
View File

@ -180,7 +180,11 @@ void Units::updateDevicePixelRatio()
// TODO: make it possible to adapt to the dpi for the current screen dpi
// instead of assuming that all of them use the same dpi which applies for
// X11 but not for other systems.
qreal dpi = QGuiApplication::primaryScreen()->logicalDotsPerInchX();
QScreen *primary = QGuiApplication::primaryScreen();
if (!primary) {
return;
}
const qreal dpi = primary->logicalDotsPerInchX();
// Usual "default" is 96 dpi
// that magic ratio follows the definition of "device independent pixel" by Microsoft
m_devicePixelRatio = (qreal)dpi / (qreal)96;