diff -r 915f824039ba -r 8e86d8d2927d project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/ChatFragment.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/ChatFragment.java Wed Aug 01 20:56:32 2012 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/ChatFragment.java Wed Aug 01 21:13:39 2012 +0200 @@ -19,22 +19,31 @@ private ChatlogAdapter adapter; private Netplay netconn; private MessageLog messageLog; + private boolean inRoom; + + public void setInRoom(boolean inRoom) { + this.inRoom = inRoom; + } @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - Bundle bundle = getArguments(); netconn = Netplay.getAppInstance(getActivity().getApplicationContext()); adapter = new ChatlogAdapter(getActivity()); - messageLog = bundle.getBoolean(ARGUMENT_INROOM) ? netconn.roomChatlog : netconn.lobbyChatlog; + } + + @Override + public void onStart() { + super.onStart(); + messageLog = inRoom ? netconn.roomChatlog : netconn.lobbyChatlog; adapter.setLog(messageLog.getLog()); messageLog.registerObserver(adapter); } @Override - public void onStart() { - super.onStart(); + public void onStop() { + super.onStop(); + messageLog.unregisterObserver(adapter); } @Override @@ -54,12 +63,6 @@ return view; } - @Override - public void onDestroy() { - super.onDestroy(); - messageLog.unregisterObserver(adapter); - } - private final class ChatSendListener implements OnEditorActionListener { public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { String text = v.getText().toString();