Fixed map lumps duplication when saving the map several times after converting the map from/to UDMF map format by changing it in the Map Options window.

Fixed, cosmetic: in some cases incorrect resource loading time was displayed after saving the map.

Source/Core/Data/DataManager.cs

@@ -560,6 +560,12 @@ namespace CodeImp.DoomBuilder.Data
 			internalsprites = null;
 			mapinfo = null; //mxd
 		}
+
+		//mxd. Called before Clock is reset
+		internal void OnBeforeClockReset()
+		{
+			if(loadstarttime > 0) loadstarttime -= Clock.CurrentTime;
+		}
 		
 		#endregion
 		
@@ -745,6 +751,7 @@ namespace CodeImp.DoomBuilder.Data
 								loadfinishtime = Clock.CurrentTime;
 								string deltatimesec = ((loadfinishtime - loadstarttime) / 1000.0f).ToString("########0.00");
 								General.WriteLogLine("Resources loading took " + deltatimesec + " seconds");
+								loadstarttime = 0; //mxd
 
 								//mxd. Show more detailed message
 								if(notifiedbusy)

Source/Core/General/General.cs

@@ -1062,9 +1062,6 @@ namespace CodeImp.DoomBuilder
 			// Ask the user to save changes (if any)
 			if(AskSaveMap())
 			{
-				//mxd. Reset the clock...
-				MainWindow.ResetClock();
-				
 				// Open map options dialog
 				MapOptionsForm optionswindow = new MapOptionsForm(newoptions, true);
 				if(optionswindow.ShowDialog(mainwindow) == DialogResult.OK)
@@ -1123,6 +1120,9 @@ namespace CodeImp.DoomBuilder
 					}
 					else
 						mainwindow.DisplayReady();
+
+					//mxd. Also reset the clock...
+					MainWindow.ResetClock();
 					
 					Cursor.Current = Cursors.Default;
 				}

Source/Core/General/MapManager.cs

@@ -962,6 +962,9 @@ namespace CodeImp.DoomBuilder
 					{
 						ConfigurationInfo ci = General.GetConfigurationInfo(origmapconfigname);
 						origcfg = new GameConfiguration(ci.Configuration);
+
+						// Needed only once!
+						origmapconfigname = configinfo.Filename;
 					}
 
 					mapheaderindex = CopyAllLumpsExceptMap(origwad, targetwad, origcfg, origmapname);

Source/Core/Windows/MainForm.cs

@@ -4205,6 +4205,10 @@ namespace CodeImp.DoomBuilder.Windows
 		//mxd
 		internal void ResetClock()
 		{
+			// Let the data manager know...
+			if(General.Map != null && General.Map.Data != null)
+				General.Map.Data.OnBeforeClockReset();
+			
 			Clock.Reset();
 			lastupdatetime = 0;