#5168: Ensure that up-to-date edit timings are written to automatic s…

…aves.

radiant/map/EditingStopwatch.cpp

@@ -43,6 +43,7 @@ const StringSet& EditingStopwatch::getDependencies() const
 	{
 		_dependencies.insert(MODULE_MAP);
 		_dependencies.insert(MODULE_MAPINFOFILEMANAGER);
+		_dependencies.insert(MODULE_MAPRESOURCEMANAGER);
 		_dependencies.insert(MODULE_UIMANAGER);
 	}
 
@@ -61,6 +62,10 @@ void EditingStopwatch::initialiseModule(const ApplicationContext& ctx)
 		std::make_shared<EditingStopwatchInfoFileModule>()
 	);
 
+	GlobalMapResourceManager().signal_onResourceExporting().connect(
+		sigc::mem_fun(this, &EditingStopwatch::onResourceExporting)
+	);
+
 	// Register the timer when the application has come up
 	GlobalRadiant().signal_radiantStarted().connect(
 		sigc::mem_fun(*this, &EditingStopwatch::onRadiantStartup));
@@ -130,7 +135,8 @@ void EditingStopwatch::onMapEvent(IMap::MapEvent ev)
 
 	// We start/stop during save operations
 	case IMap::MapSaving:
-		writeToMapProperties();
+		// the timing is not written to the map root node here,
+		// but in the separate resource-exporting event
 		stop();
 		break;
 	case IMap::MapSaved:
@@ -142,6 +148,11 @@ void EditingStopwatch::onMapEvent(IMap::MapEvent ev)
 	};
 }
 
+void EditingStopwatch::onResourceExporting(const scene::IMapRootNodePtr& root)
+{
+	writeToMapProperties(root);
+}
+
 void EditingStopwatch::start()
 {
 	if (_timer)
@@ -182,10 +193,8 @@ void EditingStopwatch::readFromMapProperties()
 	}
 }
 
-void EditingStopwatch::writeToMapProperties()
+void EditingStopwatch::writeToMapProperties(const scene::IMapRootNodePtr& root)
 {
-	auto root = GlobalMapModule().getRoot();
-
 	if (root)
 	{
 		root->setProperty(MAP_PROPERTY_KEY, string::to_string(getTotalSecondsEdited()));

radiant/map/EditingStopwatch.h

@@ -51,7 +51,8 @@ class EditingStopwatch :
 	void onRadiantStartup();
 	void onIntervalReached(wxTimerEvent& ev);
 	void readFromMapProperties();
-	void writeToMapProperties();
+	void writeToMapProperties(const scene::IMapRootNodePtr& root);
+	void onResourceExporting(const scene::IMapRootNodePtr& root);
 };
 
 }