Fix NPE

arianne · Apr 4, 2024 · d88ee79 · d88ee79
1 parent 1c53e95
commit d88ee79
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/android/client/src/main/java/org/stendhalgame/client/MainActivity.java b/app/android/client/src/main/java/org/stendhalgame/client/MainActivity.java
@@ -60,12 +60,12 @@ protected void onCreate(final Bundle savedInstanceState) {
 			// initialize debug logging mechanism
 			Logger.init(getExternalFilesDir(null));
 
-			updateOrientation();
-
 			setContentView(R.layout.activity_main);
-			menu = Menu.get();
 			clientList = findViewById(R.id.clientList);
 			createClientView();
+			// NOTE: client view instance must be created before initializing menu
+			menu = Menu.get();
+			updateOrientation();
 		} catch (final Exception e) {
 			// TODO: add option to save to file or copy to clipboard the error
 			e.printStackTrace();
@@ -107,9 +107,9 @@ public void onBackPressed() {
 	 */
 	private void createClientView() {
 		final ClientView clientView = new ClientView(this);
-		clientView.loadTitleScreen();
 		setActiveClientView(clientView);
 		clientList.addView(clientView);
+		clientView.loadTitleScreen();
 	}
 
 	/**