From 8f793eb1b9dd76a75065d2d26f1d7a991205c030 Mon Sep 17 00:00:00 2001 From: Sibo Van Gool Date: Tue, 28 Sep 2021 23:31:03 +0200 Subject: [PATCH] Fix FileHelper.forceExtension only checking for end of filename for file extension --- swing/src/net/sf/openrocket/gui/util/FileHelper.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/swing/src/net/sf/openrocket/gui/util/FileHelper.java b/swing/src/net/sf/openrocket/gui/util/FileHelper.java index f3886ebbd..c88b99a58 100644 --- a/swing/src/net/sf/openrocket/gui/util/FileHelper.java +++ b/swing/src/net/sf/openrocket/gui/util/FileHelper.java @@ -119,7 +119,12 @@ public final class FileHelper { if ( original == null ) { return null; } - if (!original.getName().toLowerCase(Locale.ENGLISH).endsWith(extension.toLowerCase(Locale.ENGLISH))) { + int index = original.getName().lastIndexOf('.'); + String original_extension = ""; + if (index > 0) { + original_extension = original.getName().substring(index + 1); + } + if (!original_extension.toLowerCase(Locale.ENGLISH).equals(extension.toLowerCase(Locale.ENGLISH))) { log.debug("File name does not contain extension, adding '" + extension + "'"); String name = original.getAbsolutePath(); if (extension.startsWith(".")) {