Fix for empty rectangle being passed to ConvertToDCS in MonitorSetupG…

…enerator when simulate monitor in profile tool is selected. #584 Tighten up the profile monitor checking against the physical displays in HeliosProfile because it was returning a match when the profile only contained a subset of the real monitors. Now the number of Monitors in the profile must match the number of displays.
HeliosVirtualCockpit · Oct 16, 2024 · ead0a0d · ead0a0d
1 parent 071c334
commit ead0a0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Helios/HeliosProfile.cs b/Helios/HeliosProfile.cs
@@ -205,7 +205,7 @@ public bool IsValidMonitorLayout
                 }
 
                 CheckedDisplays = ConfigManager.DisplayManager.Displays;
-                _validLayout = true;
+                _validLayout = CheckedDisplays.Count == Monitors.Count;
                 foreach (Monitor display in Monitors)
                 {
                     if (CheckedDisplays.Any(systemDisplay =>

diff --git a/Patching/DCS/MonitorSetupGenerator.cs b/Patching/DCS/MonitorSetupGenerator.cs
@@ -301,8 +301,14 @@ private IEnumerable<StatusReportItem> UpdateMonitorSetup(MonitorSetupTemplate te
 
         internal void ConvertToDCS(ref Rect windowsRect)
         {
-            windowsRect.Offset(-_parent.Rendered.TopLeft.X, -_parent.Rendered.TopLeft.Y);
-            windowsRect.Scale(ConfigManager.DisplayManager.PixelsPerDip, ConfigManager.DisplayManager.PixelsPerDip);
+            if (!windowsRect.IsEmpty)
+            {
+                windowsRect.Offset(-_parent.Rendered.TopLeft.X, -_parent.Rendered.TopLeft.Y);
+                windowsRect.Scale(ConfigManager.DisplayManager.PixelsPerDip, ConfigManager.DisplayManager.PixelsPerDip);
+            } else
+            {
+                windowsRect = _parent.Rendered;
+            }
         }
 
         private bool TryCreateViewport(ICollection<FormattableString> lines, KeyValuePair<string, Rect> viewport, string indent, out FormattableString code)