Improve Audio code stability

redomar · Feb 2, 2024 · 41d217e · 41d217e
1 parent 61b7d66
commit 41d217e
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/com/redomar/game/audio/AudioHandler.java b/src/com/redomar/game/audio/AudioHandler.java
@@ -33,7 +33,7 @@ public AudioHandler(String path, boolean music) {
 
 	private void check(String path) {
 		try {
-			if (!path.equals("")) {
+			if (!path.isEmpty()) {
 				initiate(path);
 			} else {
 				throw new NullPointerException();
@@ -89,14 +89,22 @@ public void setVolume(float velocity) throws NullPointerException {
 	}
 
 	public void stop() {
-		if (clip.isRunning()) clip.stop();
-		if (music) musicPrinter.print("Stopping Music");
-		active = false;
+		try {
+			if (clip == null) throw new RuntimeException("Empty clip");
+			if (clip.isRunning()) {
+				clip.stop();
+				clip.close();
+			}
+		} catch (Exception e) {
+			musicPrinter.print("Audio Handler Clip not found");
+		} finally {
+			if (music) musicPrinter.print("Stopping Music");
+			active = false;
+		}
 	}
 
 	public void close() {
 		stop();
-		clip.close();
 	}
 
 	public boolean getActive() {