Skip to content

Commit aa82d14

Browse files
authored
Fix Missing Logo File Throwing an Error (#488)
1 parent 1e36981 commit aa82d14

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

src/PAModel/Serializers/SourceSerializer.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -368,10 +368,6 @@ private static void GetLogoFile(this CanvasDocument app)
368368
app._unknownFiles.Remove(key);
369369
app._logoFile = logoFile;
370370
}
371-
else
372-
{
373-
throw new InvalidOperationException($"Missing logo file {key}");
374-
}
375371
}
376372
}
377373

src/PAModel/Serializers/TransformLogo.cs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,23 @@ public static (PublishInfoJson, FileEntry) TransformLogoOnSave(this CanvasDocume
4848
FileEntry logoFile = null;
4949
var publishInfo = app._publishInfo.JsonClone();
5050

51-
if (!string.IsNullOrEmpty(publishInfo?.LogoFileName))
52-
{
53-
app._assetFiles.Remove(app._logoFile.Name);
54-
publishInfo.LogoFileName = app._entropy.OldLogoFileName ?? Path.GetFileName(app._logoFile.Name.ToPlatformPath());
55-
logoFile = new FileEntry
51+
if (app._logoFile != null) {
52+
if (!string.IsNullOrEmpty(publishInfo?.LogoFileName))
5653
{
57-
Name = FilePath.RootedAt("Resources", FilePath.FromMsAppPath(publishInfo.LogoFileName)),
58-
RawBytes = app._logoFile.RawBytes
59-
};
54+
app._assetFiles.Remove(app._logoFile.Name);
55+
publishInfo.LogoFileName = app._entropy.OldLogoFileName ?? Path.GetFileName(app._logoFile.Name.ToPlatformPath());
56+
logoFile = new FileEntry
57+
{
58+
Name = FilePath.RootedAt("Resources", FilePath.FromMsAppPath(publishInfo.LogoFileName)),
59+
RawBytes = app._logoFile.RawBytes
60+
};
61+
}
62+
}
63+
else {
64+
if (app._entropy.OldLogoFileName != null)
65+
{
66+
publishInfo.LogoFileName = app._entropy.OldLogoFileName;
67+
}
6068
}
6169

6270
return (publishInfo, logoFile);

0 commit comments

Comments
 (0)