Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix GHOST crash on X11 with recent DPI changes on some systems.

Browse Source
This commit is contained in:
Brecht Van Lommel
2017-03-25 19:29:37 +01:00
parent fe3fb23697
commit 393efccb19
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
intern/ghost/intern/GHOST_WindowX11.cpp
View File

@@ -1683,15 +1683,17 @@ getDPIHint()
{ {
/* Try to read DPI setting set using xrdb */ /* Try to read DPI setting set using xrdb */
char* resMan = XResourceManagerString(m_display); char* resMan = XResourceManagerString(m_display);
XrmDatabase xrdb = XrmGetStringDatabase(resMan); if (resMan) {
if (xrdb) { XrmDatabase xrdb = XrmGetStringDatabase(resMan);
char* type = NULL; if (xrdb) {
XrmValue val; char* type = NULL;
XrmValue val;
int success = XrmGetResource(xrdb, "Xft.dpi", "Xft.Dpi", &type, &val); int success = XrmGetResource(xrdb, "Xft.dpi", "Xft.Dpi", &type, &val);
if (success && type) { if (success && type) {
if (strcmp(type, "String") == 0) { if (strcmp(type, "String") == 0) {
return atoi((char*)val.addr); return atoi((char*)val.addr);
}
} }
} }
} }