From b6ef2a607d89fb5362323556b38e6e4d313251bb Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Thu, 20 Dec 2012 13:09:17 +0000
Subject: [PATCH] Make sure that error states take priority when reporting
 status messages.

---
 .../com/reecedunn/espeak/eSpeakActivity.java  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/android/src/com/reecedunn/espeak/eSpeakActivity.java b/android/src/com/reecedunn/espeak/eSpeakActivity.java
index 8c3e6b16..35198aae 100644
--- a/android/src/com/reecedunn/espeak/eSpeakActivity.java
+++ b/android/src/com/reecedunn/espeak/eSpeakActivity.java
@@ -181,20 +181,20 @@ public class eSpeakActivity extends Activity {
         }
 
         final String statusText;
-        if (!getPackageName().equals(mTts.getDefaultEngine())) {
-            statusText = getString(R.string.set_default_message);
-        } else {
-            switch (mState) {
-            case ERROR:
-                statusText = getString(R.string.error_message);
-                break;
-            case DOWNLOAD_FAILED:
-                statusText = getString(R.string.voice_data_failed_message);
-                break;
-            default:
+        switch (mState) {
+        case ERROR:
+            statusText = getString(R.string.error_message);
+            break;
+        case DOWNLOAD_FAILED:
+            statusText = getString(R.string.voice_data_failed_message);
+            break;
+        default:
+            if (!getPackageName().equals(mTts.getDefaultEngine())) {
+                statusText = getString(R.string.set_default_message);
+            } else {
                 statusText = null;
-                break;
             }
+            break;
         }
         if (statusText != null) {
             final String statusLabel = getString(R.string.status);
@@ -254,7 +254,7 @@ public class eSpeakActivity extends Activity {
      * @param status The TTS engine initialization status.
      */
     private void onInitialized(int status) {
-        if (status == TextToSpeech.ERROR) {
+        if (status != TextToSpeech.SUCCESS) {
         	Log.e(TAG, "Initialization failed (status: " + status + ").");
             setState(State.ERROR);
         } else {