From 4a62478545ec69e3009783dfc62e2890c94484c5 Mon Sep 17 00:00:00 2001
From: ZZYZX <zzyzx@virtual>
Date: Tue, 14 Feb 2017 17:48:31 +0200
Subject: [PATCH] Fixed: 'Save into' would detect non-map lumps with the same
name as maps and ask if you want to save over...
---
Source/Core/General/MapManager.cs | 2 +-
Source/Core/Properties/AssemblyInfo.cs | 4 ++--
Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Source/Core/General/MapManager.cs b/Source/Core/General/MapManager.cs
index 77864250d..5508a8cfa 100755
--- a/Source/Core/General/MapManager.cs
+++ b/Source/Core/General/MapManager.cs
@@ -908,7 +908,7 @@ namespace CodeImp.DoomBuilder
if(purpose == SavePurpose.IntoFile)
{
WAD wad = new WAD(newfilepathname, true);
- int mapindex = wad.FindLumpIndex(origmapname);
+ int mapindex = FindAndRemoveMap(wad, origmapname, false);
wad.Dispose();
if(mapindex != -1 && MessageBox.Show(General.MainWindow, "Target file already contains map \"" + origmapname + "\"\nDo you want to replace it?", "Map already exists!", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs
index 14f1e27ce..982df4854 100755
--- a/Source/Core/Properties/AssemblyInfo.cs
+++ b/Source/Core/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("2.3.0.2895")]
+[assembly: AssemblyVersion("2.3.0.2897")]
[assembly: NeutralResourcesLanguageAttribute("en")]
-[assembly: AssemblyHash("f895950")]
+[assembly: AssemblyHash("d468608")]
diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
index 1ef13149e..07796ca98 100755
--- a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
+++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Resources;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("2.3.0.2895")]
+[assembly: AssemblyVersion("2.3.0.2897")]
[assembly: NeutralResourcesLanguageAttribute("en")]
--
GitLab