From ad9837830bd5e24a6fa2f5a36ca03f041bd95fcb Mon Sep 17 00:00:00 2001
From: Charlie Groves <charlie@threerings.net>
Date: Thu, 5 Mar 2009 23:15:42 +0000
Subject: [PATCH] Check that the new variable isn't null, not the one that we
 just checked two lines ago

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@779 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 src/java/com/threerings/openal/OpenALSoundPlayer.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/java/com/threerings/openal/OpenALSoundPlayer.java b/src/java/com/threerings/openal/OpenALSoundPlayer.java
index 3e25bd03..2c2f1a17 100644
--- a/src/java/com/threerings/openal/OpenALSoundPlayer.java
+++ b/src/java/com/threerings/openal/OpenALSoundPlayer.java
@@ -113,7 +113,7 @@ public class OpenALSoundPlayer extends SoundPlayer
     public void setClipVolume (final float vol)
     {
         super.setClipVolume(vol);
-        _ticker.postRunnable(new Runnable() {
+        getSoundQueue().postRunnable(new Runnable() {
             public void run () {
                 _alSoundManager.setBaseGain(vol);
             }});
@@ -173,7 +173,7 @@ public class OpenALSoundPlayer extends SoundPlayer
         InputStream rsrc = _loader.getSound(bundle, path);
         final StreamDecoder dec = new OggStreamDecoder();
         dec.init(rsrc);
-        getSoundQueue().postRunnable(new Runnable(){
+        getSoundQueue().postRunnable(new Runnable() {
             public void run () {
                 Stream s = new Stream(_alSoundManager) {
                     @Override
@@ -287,14 +287,15 @@ public class OpenALSoundPlayer extends SoundPlayer
     @Override
     public void shutdown ()
     {
-        getSoundQueue().postRunnable(new Runnable(){
+        getSoundQueue().postRunnable(new Runnable() {
             public void run () {
                 _group.dispose();
                 _locked.clear();
                 for (Stream stream : _alSoundManager.getStreams()) {
                     stream.dispose();
                 }
-            }});
+            }
+        });
     }
 
     /**
@@ -307,7 +308,7 @@ public class OpenALSoundPlayer extends SoundPlayer
         Preconditions.checkNotNull(bundle,
             "Unable to find the bundle name for a package [package=%s, key=%s]", pkgPath, key);
         String[] names = _loader.getPaths(pkgPath, key);
-        Preconditions.checkNotNull(bundle, "No such sound [package=%s, key=%s]", pkgPath, key);
+        Preconditions.checkNotNull(names, "No such sound [package=%s, key=%s]", pkgPath, key);
         String[] paths = new String[names.length];
         for (int ii = 0; ii < paths.length; ii++) {
             paths[ii] = bundle + ":" + names[ii];