Bugfix: Only add conversation phrase to conversation dialog once. (issue 317) (Thanks...

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
index 9bcb18f583fe71affc0d013db14ec527dd748e49..78b9d1fca04181d92f0084fa32b3a97d01b923fb 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
@@ -62,6 +62,7 @@ public final class ConversationActivity extends Activity implements OnKeyListene
        private OnCheckedChangeListener radioButtonListener;
        private boolean displayActors = true;
        private boolean applyPhraseRewards = true;
+       private boolean hasResumed = false;
        
        private final ConversationCollection conversationCollection = new ConversationCollection();
        
@@ -136,7 +137,10 @@ public final class ConversationActivity extends Activity implements OnKeyListene
        protected void onResume() {
                super.onResume();
                
-        setPhrase(phraseID);
+               if (!hasResumed) {
+                       setPhrase(phraseID);
+                       hasResumed = true;
+               }
         applyPhraseRewards = true;
        nextButton.requestFocus();
        }
@@ -204,7 +208,7 @@ public final class ConversationActivity extends Activity implements OnKeyListene
                }
        }
     
-    public void setPhrase(String phraseID) {
+    private void setPhrase(String phraseID) {
                this.phraseID = phraseID;
        if (phraseID.equalsIgnoreCase(ConversationCollection.PHRASE_CLOSE)) {
                ConversationActivity.this.finish();