blind attempt to fix not reproducable bug

- #72
truj · Jan 16, 2022 · fcb2d96 · fcb2d96
1 parent d8805f8
commit fcb2d96
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/midica.jar b/midica.jar
diff --git a/src/org/midica/Midica.java b/src/org/midica/Midica.java
@@ -36,10 +36,10 @@ public class Midica {
 	private static final int VERSION_MINOR = 1;
 
 	/** UNIX timestamp of the last commit */
-	public static final int COMMIT_TIME = 1623078409;
+	public static final int COMMIT_TIME = 1642352527;
 
 	/** Branch name. Automatically changed by precommit.pl */
-	public static final String BRANCH = "master";
+	public static final String BRANCH = "bug72";
 
 	/** Full version string. */
 	public static final String VERSION = VERSION_MAJOR + "." + VERSION_MIDDLE + "." + VERSION_MINOR + ("master".equals(BRANCH) ? "" : "-" + BRANCH);

diff --git a/src/org/midica/file/write/Decompiler.java b/src/org/midica/file/write/Decompiler.java
@@ -280,8 +280,14 @@ public ExportResult export(File file) throws ExportException {
 		model.postprocess();
 
 		// charset
-		String targetCharset = ((ComboboxStringOption) ConfigComboboxModel.getModel(Config.CHARSET_EXPORT_MPL).getSelectedItem()).getIdentifier();
-		// TODO: ALDA charset
+		String targetCharset = "UTF-8";
+		try {
+			// TODO: ALDA charset
+			targetCharset = ((ComboboxStringOption) ConfigComboboxModel.getModel(Config.CHARSET_EXPORT_MPL).getSelectedItem()).getIdentifier();
+		}
+		catch (NullPointerException e) {
+			e.printStackTrace(); // bug #72
+		}
 
 		try {