[Bf-blender-cvs] [393efccb19] master: Fix GHOST crash on X11 with recent DPI changes on some systems.

Brecht Van Lommel noreply at git.blender.org
Sat Mar 25 19:36:12 CET 2017


Commit: 393efccb19e4340c414af5d6da74060b6534ca25
Author: Brecht Van Lommel
Date:   Sat Mar 25 19:29:37 2017 +0100
Branches: master
https://developer.blender.org/rB393efccb19e4340c414af5d6da74060b6534ca25

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

===================================================================

M	intern/ghost/intern/GHOST_WindowX11.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 429c9af0e3..2019f58251 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -1683,15 +1683,17 @@ getDPIHint()
 {
 	/* Try to read DPI setting set using xrdb */
 	char* resMan = XResourceManagerString(m_display);
-	XrmDatabase xrdb = XrmGetStringDatabase(resMan);
-	if (xrdb) {
-		char* type = NULL;
-		XrmValue val;
-
-		int success = XrmGetResource(xrdb, "Xft.dpi", "Xft.Dpi", &type, &val);
-		if (success && type) {
-			if (strcmp(type, "String") == 0) {
-				return atoi((char*)val.addr);
+	if (resMan) {
+		XrmDatabase xrdb = XrmGetStringDatabase(resMan);
+		if (xrdb) {
+			char* type = NULL;
+			XrmValue val;
+
+			int success = XrmGetResource(xrdb, "Xft.dpi", "Xft.Dpi", &type, &val);
+			if (success && type) {
+				if (strcmp(type, "String") == 0) {
+					return atoi((char*)val.addr);
+				}
 			}
 		}
 	}




More information about the Bf-blender-cvs mailing list