Merge branch 'dev'

stevemonaco · Apr 8, 2020 · 00af301 · 00af301
2 parents ad1c1c8 + 0ddc0b1
commit 00af301
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/TileShop.WPF/TileShop.WPF.csproj b/TileShop.WPF/TileShop.WPF.csproj
@@ -6,7 +6,7 @@
     <LangVersion>8.0</LangVersion>
     <UseWPF>true</UseWPF>
     <AssemblyName>TileShop</AssemblyName>
-    <Version>0.92</Version>
+    <Version>0.93</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/TileShop.WPF/ViewModels/Dialogs/ImportImageViewModel.cs b/TileShop.WPF/ViewModels/Dialogs/ImportImageViewModel.cs
@@ -139,7 +139,7 @@ private void ImportIndexed(string fileName)
                 fail =>
                 {
                     CanImport = false;
-                    ImageFileName = string.Empty;
+                    ImageFileName = fileName;
                     ImportedSource = null;
                     ImportError = fail.Reason;
                 });
@@ -150,9 +150,9 @@ private void ImportIndexed(string fileName)
 
         public void ConfirmImport()
         {
-            if (IsTiledArranger)
+            if (_arranger.ColorType == PixelColorType.Indexed)
                 _importedIndexed.SaveImage();
-            else if (IsSingleArranger)
+            else if (_arranger.ColorType == PixelColorType.Direct)
                 _importedDirect.SaveImage();
 
             RequestClose(true);