Fixed: lump saving in script editor after editing archive with SLADE.\n Fixed: checking for concurrent modification in script editor while trying to save the lump.

Source/Core/Controls/Scripting/ScriptResourceDocumentTab.cs

@@ -98,11 +98,16 @@ namespace CodeImp.DoomBuilder.Controls
 			// Find lump, check it's hash
 			bool dosave = true;
 			DataReader reader = source.Resource;
-			if(reader.FileExists(source.Filename, source.LumpIndex))
+            // reload the reader
+            bool wasReadOnly = reader.IsReadOnly;
+            reader.Reload(false);
+            try
             {
-				using(MemoryStream ms = reader.LoadFile(source.Filename, source.LumpIndex))
+                if (reader.FileExists(source.Filename, source.LumpIndex))
                 {
-					if(MD5Hash.Get(ms) != hash
+                    using (MemoryStream ms = reader.LoadFile(source.Filename, source.LumpIndex))
+                    {
+                        if (MD5Hash.Get(ms) != hash
                             && MessageBox.Show("Target lump was modified by another application. Do you still want to replace it?", "Warning", MessageBoxButtons.OKCancel)
                             == DialogResult.Cancel)
                         {
@@ -111,12 +116,12 @@ namespace CodeImp.DoomBuilder.Controls
                     }
                 }
 
-			if(dosave)
+                if (dosave)
                 {
                     // Store the lump data
-				using(MemoryStream stream = new MemoryStream(editor.GetText()))
+                    using (MemoryStream stream = new MemoryStream(editor.GetText()))
                     {
-					if(reader.SaveFile(stream, source.Filename, source.LumpIndex))
+                        if (reader.SaveFile(stream, source.Filename, source.LumpIndex))
                         {
                             // Update what must be updated
                             hash = MD5Hash.Get(stream);
@@ -124,6 +129,11 @@ namespace CodeImp.DoomBuilder.Controls
                             UpdateTitle();
                         }
                     }
+                }
+            }
+            finally
+            {
+                reader.Reload(wasReadOnly);
             }
 
 			return dosave;

Source/Core/Data/DataReader.cs

@@ -141,13 +141,25 @@ namespace CodeImp.DoomBuilder.Data
 		// This suspends use of this resource
 		public virtual void Suspend()
 		{
+            // [ZZ] validate
+            if (issuspended) throw new Exception("Tried to suspend already suspended resource!");
 			issuspended = true;
+            isreadonly = true;
 		}
 
 		// This resumes use of this resource
 		public virtual void Resume()
 		{
+            // [ZZ] validate
+            if (!issuspended) throw new Exception("Tried to resume already resumed resource!");
             issuspended = false;
+            isreadonly = false;
+		}
+
+        // This reloads the resource (possibly as readonly).
+        public virtual void Reload(bool newreadonly)
+        {
+
         }
 
 		#endregion

Source/Core/Data/PK3Reader.cs

@@ -35,10 +35,10 @@ namespace CodeImp.DoomBuilder.Data
 	{
 		#region ================== Variables
 
-		private readonly DirectoryFilesList files;
+		private /*readonly*/ DirectoryFilesList files;
 		private IArchive archive; //mxd
-		private readonly ArchiveType archivetype; //mxd
+		private /*readonly*/ ArchiveType archivetype; //mxd
-		private readonly Dictionary<string, byte[]> sevenzipentries; //mxd
+		private /*readonly*/ Dictionary<string, byte[]> sevenzipentries; //mxd
 		private bool bathmode = true; //mxd
 
 		#endregion
@@ -53,10 +53,15 @@ namespace CodeImp.DoomBuilder.Data
 
 		// Constructor
 		public PK3Reader(DataLocation dl, bool asreadonly) : base(dl, asreadonly)
+		{
+            LoadFrom(dl, asreadonly);
+		}
+
+        private void LoadFrom(DataLocation dl, bool asreadonly)
         {
             General.WriteLogLine("Opening " + Path.GetExtension(location.location).ToUpper().Replace(".", "") + " resource \"" + location.location + "\"");
 
-			if(!File.Exists(location.location))
+            if (!File.Exists(location.location))
                 throw new FileNotFoundException("Could not find the file \"" + location.location + "\"", location.location);
 
             // Make list of all files
@@ -67,15 +72,15 @@ namespace CodeImp.DoomBuilder.Data
             archivetype = archive.Type;
 
             // Random access of 7z archives works TERRIBLY slow in SharpCompress
-			if(archivetype == ArchiveType.SevenZip) 
+            if (archivetype == ArchiveType.SevenZip)
             {
                 isreadonly = true; // Unsaveable...
                 sevenzipentries = new Dictionary<string, byte[]>(StringComparer.Ordinal);
 
                 IReader reader = archive.ExtractAllEntries();
-				while(reader.MoveToNextEntry()) 
+                while (reader.MoveToNextEntry())
                 {
-					if(reader.Entry.IsDirectory || !CheckInvalidPathChars(reader.Entry.Key)) continue;
+                    if (reader.Entry.IsDirectory || !CheckInvalidPathChars(reader.Entry.Key)) continue;
 
                     MemoryStream s = new MemoryStream();
                     reader.WriteEntryTo(s);
@@ -85,9 +90,9 @@ namespace CodeImp.DoomBuilder.Data
             }
             else
             {
-				foreach(IArchiveEntry entry in archive.Entries) 
+                foreach (IArchiveEntry entry in archive.Entries)
                 {
-					if(!entry.IsDirectory && CheckInvalidPathChars(entry.Key))
+                    if (!entry.IsDirectory && CheckInvalidPathChars(entry.Key))
                         fileentries.Add(new DirectoryFileEntry(entry.Key));
                 }
             }
@@ -151,6 +156,19 @@ namespace CodeImp.DoomBuilder.Data
 
         #endregion
 
+        #region ================== Management
+
+        // [ZZ]
+        // This reloads the resource
+        public override void Reload(bool newreadonly)
+        {
+            if (archive != null)
+                archive.Dispose();
+            LoadFrom(location, newreadonly);
+        }
+
+        #endregion
+
         #region ================== Textures
 
         // This finds and returns a patch stream

Source/Core/Data/PK3StructuredReader.cs

@@ -72,6 +72,8 @@ namespace CodeImp.DoomBuilder.Data
 		// Call this to initialize this class
 		protected virtual void Initialize()
 		{
+            // [ZZ] we can have wad files already. dispose if any.
+            if (wads != null) foreach (WADReader wr in wads) wr.Dispose();
             // Load all WAD files in the root as WAD resources
             string[] wadfiles = GetWadFiles();
 			wads = new List<WADReader>(wadfiles.Length);

Source/Core/Data/WADReader.cs

@@ -211,17 +211,26 @@ namespace CodeImp.DoomBuilder.Data
 		public override void Suspend()
 		{
 			file.Dispose();
+            file = null;
 			base.Suspend();
 		}
 
 		// This resumes use of this resource
 		public override void Resume()
 		{
-			file = new WAD(location.location, true);
+            Reload(true);
-			is_iwad = file.IsIWAD;
 			base.Resume();
 		}
 
+        // This reloads the resource
+        public override void Reload(bool newreadonly)
+        {
+            if (file != null) file.Dispose();
+            file = new WAD(location.location, newreadonly);
+            is_iwad = file.IsIWAD;
+            base.Reload(newreadonly);
+        }
+
         // This fills a ranges list
         private void FindRanges(List<LumpRange> ranges, IDictionary rangeinfos, string rangename, string elementname)
 		{

Source/Core/Properties/AssemblyInfo.cs

@@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.3.0.2837")]
+[assembly: AssemblyVersion("2.3.0.2839")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
-[assembly: AssemblyHash("30a5edf")]
+[assembly: AssemblyHash("a705e47")]

Source/Core/Windows/OpenMapOptionsForm.cs

@@ -212,8 +212,11 @@ namespace CodeImp.DoomBuilder.Windows
 				}
 			}
 
+            // [ZZ] dispose of wadfile
+            wadfile.Dispose();
+
             //mxd. Bail out if still no dice...
-			if(config.SelectedIndex == -1 || mapslist.Items.Count == 0)
+            if (config.SelectedIndex == -1 || mapslist.Items.Count == 0)
 			{
 				General.ShowWarningMessage("Unable to find maps using any game configuration.\nDoes this wad contain any maps at all?..", MessageBoxButtons.OK);
 				cancel_Click(this, EventArgs.Empty);

Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Resources;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.3.0.2837")]
+[assembly: AssemblyVersion("2.3.0.2839")]
 [assembly: NeutralResourcesLanguageAttribute("en")]