X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/blobdiff_plain/5ad04c7bbedbb4328de77acc0c792fbf7885b8de..117aa54f84005638b516723aca2e9d9d2c6283de:/js/sound.js

diff --git a/js/sound.js b/js/sound.js
index 4bbdaa7..08316ae 100644
--- a/js/sound.js
+++ b/js/sound.js
@@ -29,8 +29,8 @@ qwebirc.sound.SoundPlayer = new Class({
     }
     
     var debugMode = false;
-    qwebirc.util.importJS("/js/" + (debugMode?"soundmanager2":"soundmanager2-nodebug-jsmin") + ".js", "soundManager", function() {
-      soundManager.url = "/sound/";
+    qwebirc.util.importJS(qwebirc.global.staticBaseURL + "js/" + (debugMode?"soundmanager2":"soundmanager2-nodebug-jsmin") + ".js", "soundManager", function() {
+      soundManager.url = qwebirc.global.staticBaseURL + "sound/";
       
       soundManager.debugMode = debugMode;
       soundManager.useConsole = debugMode;
@@ -42,14 +42,22 @@ qwebirc.sound.SoundPlayer = new Class({
     }.bind(this));
   },
   createSound: function(name, src) {
-    soundManager.createSound(name, src);
+    try {
+      soundManager.createSound(name, src);
+    } catch(e) {
+      /* ignore... flashblock triggers this */
+    }
   },
   playSound: function(name) {
-    soundManager.play(name);
+    try {
+      soundManager.play(name);
+    } catch(e) {
+      /* ignore... */
+    }
   },
   beep: function() {
     if(!this.beepLoaded) {
-      this.createSound("beep", "/sound/beep3.mp3");
+      this.createSound("beep", qwebirc.global.staticBaseURL + "sound/beep3.mp3");
       this.beepLoaded = true;
     }
     this.playSound("beep");