Check isFinishing when creating a Toast in some cases.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index b017e9c500cab93b2d2d509aed15cc2ee64c9740..8ab56277b2b6832ae274353f73d1adc8982498d2 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -784,7 +784,8 @@ public class DictionaryActivity extends ActionBarActivity {
                 Log.e(LOG, "TTS not available in this language: ttsResult=" + ttsResult);
             }
         } catch (Exception e) {
-            Toast.makeText(this, getString(R.string.TTSbroken), Toast.LENGTH_LONG).show();
+            if (!isFinishing())
+                Toast.makeText(this, getString(R.string.TTSbroken), Toast.LENGTH_LONG).show();
         }
     }
 
@@ -974,8 +975,6 @@ public class DictionaryActivity extends ActionBarActivity {
             }
         });
 
-        application.onCreateGlobalOptionsMenu(this, menu);
-
         {
             final MenuItem dictionaryManager = menu.add(getString(R.string.dictionaryManager));
             MenuItemCompat.setShowAsAction(dictionaryManager, MenuItem.SHOW_AS_ACTION_NEVER);
@@ -1046,6 +1045,8 @@ public class DictionaryActivity extends ActionBarActivity {
             });
         }
 
+        application.onCreateGlobalOptionsMenu(this, menu);
+
         return true;
     }