Merge branch 'journalFirst' into 'master'

FIX: Serialize journal records first when saving plugins See merge request OpenMW/openmw!4405
OpenMW · Oct 22, 2024 · 1fcbcd5 · 1fcbcd5
2 parents cdf7bd7 + ea52a5f
commit 1fcbcd5
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/apps/opencs/model/doc/saving.cpp b/apps/opencs/model/doc/saving.cpp
@@ -112,12 +112,13 @@ CSMDoc::Saving::Saving(Document& document, const std::filesystem::path& projectP
 
     appendStage(new WriteCellCollectionStage(mDocument, mState));
 
-    // Dialogue can reference objects and cells so must be written after these records for vanilla-compatible files
-
-    appendStage(new WriteDialogueCollectionStage(mDocument, mState, false));
+    // Dialogue can reference objects, cells, and journals so must be written after these records for vanilla-compatible
+    // files
 
     appendStage(new WriteDialogueCollectionStage(mDocument, mState, true));
 
+    appendStage(new WriteDialogueCollectionStage(mDocument, mState, false));
+
     appendStage(new WritePathgridCollectionStage(mDocument, mState));
 
     appendStage(new WriteLandTextureCollectionStage(mDocument, mState));