diff --git a/Source/Core/Data/PK3Reader.cs b/Source/Core/Data/PK3Reader.cs index 8051598f22de01d381305d313afc037f48340695..f31a22558a47a59eae7969e8b277a8306559a167 100644 --- a/Source/Core/Data/PK3Reader.cs +++ b/Source/Core/Data/PK3Reader.cs @@ -584,6 +584,9 @@ namespace CodeImp.DoomBuilder.Data File.WriteAllBytes(location.location, savestream.ToArray()); } + // Rewind the stream (because DirectoryReader/WADReader don't modify stream Position in SaveFile) + stream.Position = 0; + return true; } diff --git a/Source/Core/General/MD5Hash.cs b/Source/Core/General/MD5Hash.cs index 0ff6bf2826dd7b6c9aaca6ea5c99f22abcc78d6c..f9a242dab742374a7b7f326914b493dd7e608da7 100644 --- a/Source/Core/General/MD5Hash.cs +++ b/Source/Core/General/MD5Hash.cs @@ -10,10 +10,13 @@ namespace CodeImp.DoomBuilder public static string Get(Stream stream) { + // Rewind the stream + stream.Position = 0; + // Check hash byte[] data = hasher.ComputeHash(stream); - // Rewind the stream + // Rewind the stream again... stream.Position = 0; // Create a new Stringbuilder to collect the bytes and create a string. diff --git a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs index 3818c79b93e90d5e31345cf79dfb5be6e3f94190..e038a9260540f961b592d69a89f9a836da5d601c 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs @@ -1263,7 +1263,7 @@ namespace CodeImp.DoomBuilder.BuilderModes General.Map.UndoRedo.CreateUndo("Paste properties to " + rest); BuilderPlug.Me.CopiedThingProps.Apply(sel, false); foreach(Thing t in sel) t.UpdateConfiguration(); - General.Interface.DisplayStatus(StatusType.Action, "Pasted properties to" + rest + "."); + General.Interface.DisplayStatus(StatusType.Action, "Pasted properties to " + rest + "."); // Update General.Map.IsChanged = true;