From 7c2ed47d920b64a00f231c07d63688ef7802c10d Mon Sep 17 00:00:00 2001
From: Michael Becker <alcexhim@gmail.com>
Date: Mon, 19 Aug 2019 12:23:42 -0400
Subject: [PATCH] Be sure to include file system from underlying
 PackageObjectModel and do all this before any other BeforeSaveInternal calls

---
 .../Package/OpenPackagingConvention/OPCDataFormat.cs        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CSharp/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/Package/OpenPackagingConvention/OPCDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/Package/OpenPackagingConvention/OPCDataFormat.cs
index d089af35..bcbf8e6c 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/Package/OpenPackagingConvention/OPCDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/Package/OpenPackagingConvention/OPCDataFormat.cs
@@ -78,10 +78,8 @@ namespace UniversalEditor.DataFormats.Package.OpenPackagingConvention
 
 		protected override void BeforeSaveInternal(Stack<ObjectModel> objectModels)
 		{
-			base.BeforeSaveInternal(objectModels);
-
 			PackageObjectModel package = (objectModels.Pop() as PackageObjectModel);
-			FileSystemObjectModel fsom = new FileSystemObjectModel();
+			FileSystemObjectModel fsom = (package.FileSystem.Clone() as FileSystemObjectModel);
 			
 			#region _rels
 			{
@@ -151,6 +149,8 @@ namespace UniversalEditor.DataFormats.Package.OpenPackagingConvention
 			#endregion
 
 			objectModels.Push(fsom);
+
+			base.BeforeSaveInternal(objectModels);
 		}
 	}
 }