Bugfix: Correctly restore conversation history after rotating device

This commit is contained in:
Oskar Wiksten
2013-06-29 19:43:11 +02:00
parent 8527b3a7c0
commit 08aa1b041b

View File

@@ -108,8 +108,8 @@ public final class ConversationActivity extends Activity implements OnKeyListene
if (savedInstanceState != null) {
conversationState.setCurrentNPC(Dialogs.getMonsterFromBundle(savedInstanceState, world));
conversationHistory = savedInstanceState.getParcelableArrayList("conversationHistory");
if (conversationHistory == null) conversationHistory = new ArrayList<ConversationStatement>();
ArrayList<ConversationStatement> savedConversationHistory = savedInstanceState.getParcelableArrayList("conversationHistory");
if (savedConversationHistory != null) conversationHistory.addAll(savedConversationHistory);
final String phraseID = savedInstanceState.getString("phraseID");
conversationState.proceedToRestoredState(phraseID);
} else {