Small fixes, mostly dupicated code

(cherry picked from commit 856a8226a5)
2019-04-08 11:03:37 +02:00
parent a2cf479f07
commit 3b703d6707
29 changed files with 32 additions and 60 deletions
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@ -1165,7 +1165,7 @@ int OS_X11::get_screen_dpi(int p_screen) const {
 	int height_mm = DisplayHeightMM(x11_display, p_screen);
 	double xdpi = (width_mm ? sc.width / (double)width_mm * 25.4 : 0);
 	double ydpi = (height_mm ? sc.height / (double)height_mm * 25.4 : 0);
-	if (xdpi || xdpi)
+	if (xdpi || ydpi)
 		return (xdpi + ydpi) / (xdpi && ydpi ? 2 : 1);

 	//could not get dpi