merge upstream

Minecraft.Client/Windows64/Windows64_Minecraft.cpp

@@ -503,8 +503,9 @@ HRESULT InitDevice()
 			g_iScreenWidth = GetSystemMetrics(SM_CXSCREEN);
 			g_iScreenHeight = GetSystemMetrics(SM_CYSCREEN);
 		}
-			g_bWidescreen = (g_iScreenHeight > 0 && ((double)g_iScreenWidth / g_iScreenHeight) >= 1.59) ? TRUE : FALSE;
-		}
+	}
+
+	g_bWidescreen = (g_iScreenHeight > 0 && ((double)g_iScreenWidth / g_iScreenHeight) >= 1.59) ? TRUE : FALSE;
 	
 	//str1k3r - stop hardcoding size and just use the screens actual size
 	UINT width = g_iScreenWidth;