From f4926fe72d7a58aa860cdbfe08676899fc3771b8 Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Tue, 11 May 2021 00:44:42 +0200 Subject: [PATCH] Always reset the maps render state if purging started --- .../common/rendermanager/MapPurgeTask.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/rendermanager/MapPurgeTask.java b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/rendermanager/MapPurgeTask.java index 5303049a..0bd31077 100644 --- a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/rendermanager/MapPurgeTask.java +++ b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/rendermanager/MapPurgeTask.java @@ -68,20 +68,22 @@ public void doWork() throws Exception { this.hasMoreWork = false; } - // delete subFiles first to be able to track the progress and cancel - while (!subFiles.isEmpty()) { - Path subFile = subFiles.getLast(); - FileUtils.delete(subFile.toFile()); - subFiles.removeLast(); - if (this.cancelled) return; - } + try { + // delete subFiles first to be able to track the progress and cancel + while (!subFiles.isEmpty()) { + Path subFile = subFiles.getLast(); + FileUtils.delete(subFile.toFile()); + subFiles.removeLast(); + if (this.cancelled) return; + } - // make sure everything is deleted - FileUtils.delete(directory.toFile()); - - // reset map render state - if (this.map != null) { - this.map.getRenderState().reset(); + // make sure everything is deleted + FileUtils.delete(directory.toFile()); + } finally { + // reset map render state + if (this.map != null) { + this.map.getRenderState().reset(); + } } }