Skip to content

Commit b863702

Browse files
committed
prepare 5.0.1
1 parent caa5938 commit b863702

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

Gui/Models/ImageTableModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public async Task ImportImages(string directory, ColourRemapSwatch primary, Colo
128128
var offsetsFile = Path.Combine(directory, "sprites.json");
129129
if (File.Exists(offsetsFile))
130130
{
131-
offsets = await JsonFile.DeserializeFromFileAsync<ICollection<G1Element32Json>>(File.ReadAllText(offsetsFile)); // sprites.json is an unnamed array so we need ICollection here, not IEnumerable
131+
offsets = await JsonFile.DeserializeFromFileAsync<ICollection<G1Element32Json>>(offsetsFile); // sprites.json is an unnamed array so we need ICollection here, not IEnumerable
132132
ArgumentNullException.ThrowIfNull(offsets);
133133
Logger.Debug($"Found sprites.json file with {offsets.Count} images");
134134
}

Gui/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0.0
1+
5.0.1

ObjectService/ServerFolderManager.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,17 @@ public ServerFolderManager(string rootDirectory)
5050
{
5151
RootDirectory = rootDirectory;
5252
var logger = new Logger();
53-
ObjectIndex = ObjectIndex.LoadOrCreateIndex(Path.Combine(rootDirectory, ObjectsFolderName), logger)!;
53+
54+
var indexFile = Path.Combine(rootDirectory, ObjectsFolderName);
55+
try
56+
{
57+
ObjectIndex = ObjectIndex.LoadOrCreateIndex(indexFile, logger)!;
58+
}
59+
catch (Exception ex)
60+
{
61+
File.Delete(indexFile);
62+
ObjectIndex = ObjectIndex.LoadOrCreateIndex(indexFile, logger)!; // try again, recreating the index
63+
}
5464

5565
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(ObjectsOriginalFolder));
5666
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(ObjectsCustomFolder));

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dotnet publish Gui/Gui.csproj -c Release -p:PublishSingleFile=true -p:Version=$v
2424
# 4. Create the ZIP and tar archives
2525
echo "Zipping"
2626

27-
pushd "Gui/bin/Release/net9.0/"
27+
pushd "Gui/bin/Release/net10.0/"
2828

2929
pushd "win-x64/publish"
3030
zip -r "object-editor-$version-win-x64.zip" .

0 commit comments

Comments
 (0)