Fixed a null pointer exception bug related to pausing the music playe…

…r when stopping the player thread.

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.jfedor.frozenbubble"
-  android:versionCode="36"
-  android:versionName="3.3">
+  android:versionCode="37"
+  android:versionName="3.4">
 
   <supports-screens
     android:smallScreens="true"

jni/jni_stubs.cpp

@@ -207,7 +207,6 @@ JNIEXPORT jboolean JNICALL Java_com_peculiargames_andmodplug_PlayerThread_ModPlu
   jbyte* bytes = env->GetByteArrayElements(buffer, 0);
   currmodFile = ModPlug_Load(bytes, csize);
   env->ReleaseByteArrayElements(buffer, bytes, 0);
-  env->DeleteLocalRef(buffer);
 
   DIABpatternchanged = 0;
   ANDMODPLUGpatternfrom = 0;

src/com/peculiargames/andmodplug/PlayerThread.java

@@ -572,14 +572,23 @@ public boolean pausePlay(boolean immediate) {
       if (mMyTrack.getState() == AudioTrack.STATE_INITIALIZED) try {
         if (immediate) {
           mMyTrack.pause();
-          mMyTrack.flush();
-          mFlushed = true;
+          if (mMyTrack != null) {
+            mMyTrack.flush();
+            mFlushed = true;
+          }
         }
         else {
           mMyTrack.stop();
         }
         paused = true;
-      } catch (IllegalStateException ise) {
+      } catch (NullPointerException npe) {
+        /*
+         * mMyTrack may be destroyed in a different process, so the
+         * slim possibility exists that we may invoke it when it has
+         * been nullified.
+         */
+      }
+        catch (IllegalStateException ise) {
         /*
          * Nothing to do here, so just try to continue gracefully.
          */
@@ -800,11 +809,16 @@ public void startPaused(boolean flag) {
    * the native player library and de-allocate all resources it used.
    */
   public void stopThread() {
+    /*
+     * Music playback must be paused before stopping the thread.  Force
+     * a flush of the audio data to immediately stop audio playback.
+     */
+    pausePlay(true);
+
     /*
      * Stops the music player thread (see run() above).
      */
     mRunning = false;
-    pausePlay(true);
 
     /*
      * Interrupt the thread if it is sleeping or waiting.