From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Thu, 13 Sep 2012 17:08:05 +0000 (+0200)
Subject: Bugfix: Only add conversation phrase to conversation dialog once. (issue 317) (Thanks... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=05b2f7ee049a4974a3dec282a8268a628c54da2f;p=users%2Fmchehab%2Fandors-trail.git

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

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
index 9bcb18f..78b9d1f 100644
--- 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();