(034bb920b) Fixed selecting display resolution when using borderless on Linux

2019-06-04 15:31:27 +03:00
parent adaa59a39b
commit b3b9167c48
2 changed files with 10 additions and 11 deletions
@@ -199,7 +199,7 @@ namespace Barotrauma

                // In a bundled .app you just disable HiDPI in the info.plist
                // but that's probably not gonna happen.
-                if (mode.Width > GameMain.Instance.GraphicsDevice.DisplayMode.Width || mode.Height > GameMain.Instance.GraphicsDevice.DisplayMode.Height) { continue; }
+                if (mode.Width > GameMain.DisplayWidth || mode.Height > GameMain.DisplayHeight) { continue; }
 #endif
                supportedDisplayModes.Add(mode);
            }
@@ -247,8 +247,8 @@ namespace Barotrauma
                if (GameMain.Config.WindowMode == WindowMode.BorderlessWindowed)
                {
                    resolutionDD.SelectItem(GraphicsAdapter.DefaultAdapter.SupportedDisplayModes.First(
-                            m => m.Width == GameMain.Instance.GraphicsDevice.DisplayMode.Width &&
-                                 m.Height == GameMain.Instance.GraphicsDevice.DisplayMode.Height));
+                            m => m.Width == GameMain.DisplayWidth &&
+                                 m.Height == GameMain.DisplayHeight));
                    resolutionDD.ButtonEnabled = false;
                }
                else