From f294094f727f051376bc422ff46e7477f9050bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tiago=20Concei=C3=A7=C3=A3o?= <Tiago_caza@hotmail.com>
Date: Sat, 25 Sep 2021 15:17:14 +0100
Subject: [PATCH] (Fix) The setting 'Auto flip layer on file load' is not
 respected when off

---
 UVtools.WPF/MainWindow.axaml.cs | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/UVtools.WPF/MainWindow.axaml.cs b/UVtools.WPF/MainWindow.axaml.cs
index 1271a47..acb3dae 100644
--- a/UVtools.WPF/MainWindow.axaml.cs
+++ b/UVtools.WPF/MainWindow.axaml.cs
@@ -1571,20 +1571,26 @@ namespace UVtools.WPF
             UpdateTitle();
 
 
-            if (mat is not null && Settings.LayerPreview.AutoRotateLayerBestView)
+            if (mat is not null)
             {
-                _showLayerImageRotated = mat.Height > mat.Width;
-            }
+                if (Settings.LayerPreview.AutoRotateLayerBestView)
+                {
+                    _showLayerImageRotated = mat.Height > mat.Width;
+                }
 
-            if (SlicerFile.DisplayMirror == Enumerations.FlipDirection.None)
-            {
-                _showLayerImageFlipped = false;
-            }
-            else
-            {
-                _showLayerImageFlipped = true;
-                _showLayerImageFlippedHorizontally = SlicerFile.DisplayMirror is Enumerations.FlipDirection.Horizontally or Enumerations.FlipDirection.Both;
-                _showLayerImageFlippedVertically = SlicerFile.DisplayMirror is Enumerations.FlipDirection.Vertically or Enumerations.FlipDirection.Both;
+                if (Settings.LayerPreview.AutoFlipLayerIfMirrored)
+                {
+                    if (SlicerFile.DisplayMirror == Enumerations.FlipDirection.None)
+                    {
+                        _showLayerImageFlipped = false;
+                    }
+                    else
+                    {
+                        _showLayerImageFlipped = true;
+                        _showLayerImageFlippedHorizontally = SlicerFile.DisplayMirror is Enumerations.FlipDirection.Horizontally or Enumerations.FlipDirection.Both;
+                        _showLayerImageFlippedVertically = SlicerFile.DisplayMirror is Enumerations.FlipDirection.Vertically or Enumerations.FlipDirection.Both;
+                    }
+                }
             }
 
             ResetDataContext();