diff --git a/.idea/libraries/jetbrains_kotlin_test.xml b/.idea/libraries/jetbrains_kotlin_test.xml index 5498430f5..194d88f26 100644 --- a/.idea/libraries/jetbrains_kotlin_test.xml +++ b/.idea/libraries/jetbrains_kotlin_test.xml @@ -2,10 +2,6 @@ - - - - diff --git a/.idea/libraries/jetbrains_kotlin_test1.xml b/.idea/libraries/jetbrains_kotlin_test1.xml new file mode 100644 index 000000000..fdb779b38 --- /dev/null +++ b/.idea/libraries/jetbrains_kotlin_test1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java index 9d30653bb..ed1fa83da 100644 --- a/src/net/torvald/terrarum/App.java +++ b/src/net/torvald/terrarum/App.java @@ -391,14 +391,18 @@ public class App implements ApplicationListener { processorVendor = "Unknown CPU"; } - if (processor.startsWith("Apple M") && systemArch.equals("aarch64")) { + if (processor != null && processor.startsWith("Apple M") && systemArch.equals("aarch64")) { isAppleM = true; System.out.println("Apple Proprietary "+processor+" detected; don't expect smooth sailing..."); } - if (processor.startsWith("Apple M") && !systemArch.equals("aarch64")) { + if (processor != null && processor.startsWith("Apple M") && !systemArch.equals("aarch64")) { undesirableConditions = "apple_execution_through_rosetta"; } + if (processor == null) { + processor = "null"; + } + if (!IS_DEVELOPMENT_BUILD) { var p = UnsafeHelper.INSTANCE.allocate(64); p.destroy(); diff --git a/src/net/torvald/terrarum/audio/TerrarumAudioMixerTrack.kt b/src/net/torvald/terrarum/audio/TerrarumAudioMixerTrack.kt index bfc643c8a..39940eb37 100644 --- a/src/net/torvald/terrarum/audio/TerrarumAudioMixerTrack.kt +++ b/src/net/torvald/terrarum/audio/TerrarumAudioMixerTrack.kt @@ -77,7 +77,8 @@ class TerrarumAudioMixerTrack( throw IllegalArgumentException("Cannot add master track as a sidechain") if (sidechainInputs.map { it.first }.any { it.hash == input.hash }) - throw IllegalArgumentException("The track '${input.hash}' already exists") + //throw IllegalArgumentException("The track '${input.hash}' already exists") + return if (getSidechains().any { mySidechain -> val theirSidechains = mySidechain?.getSidechains()