Merge remote-tracking branch 'origin/master'

wyskoj · Apr 2, 2022 · 7e9a4fe · 7e9a4fe
2 parents e1f66a2 + 5851dd8
commit 7e9a4fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/README.adoc b/README.adoc
@@ -63,7 +63,8 @@ Development contributors:
 
 Internationalization:
 
-* Mr. Tremolo Measure
+* ES — Mr. Tremolo Measure
+* RU — https://github.com/rxuglr[rxuglr]
 
 == ⁉️ Support
 

diff --git a/src/main/kotlin/org/wysko/midis2jam2/gui/Launcher.kt b/src/main/kotlin/org/wysko/midis2jam2/gui/Launcher.kt
@@ -164,10 +164,12 @@ fun Launcher() {
                 Properties().apply {
                     setProperty("midi_file", selectedMidiFile)
                     setProperty("midi_device", selectedMidiDevice)
-                    setProperty("soundfont",
-                        launcherState.soundfonts.map { File(it) }
-                            .first { it.name == soundFonts[selectedSoundFont] }.absolutePath
-                    )
+                    if (soundFonts[selectedSoundFont] != "Default SoundFont") {
+                        setProperty("soundfont",
+                            launcherState.soundfonts.map { File(it) }
+                                .first { it.name == soundFonts[selectedSoundFont] }.absolutePath
+                        )
+                    }
                 },
                 onStart = {
                     freeze = true