From 05b2f7ee049a4974a3dec282a8268a628c54da2f Mon Sep 17 00:00:00 2001 From: Oskar Wiksten Date: Thu, 13 Sep 2012 19:08:05 +0200 Subject: [PATCH] Bugfix: Only add conversation phrase to conversation dialog once. (issue 317) (Thanks nether!) --- .../rpg/AndorsTrail/activity/ConversationActivity.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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(); -- 2.49.0