From b2d4a5aab049f49ee8c7e25ca2ed7d44fd2592c1 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sat, 27 May 2023 11:21:09 +0200
Subject: [PATCH] fix(instance.info): hide menu until loaded

---
 .../android/fragments/InstanceInfoFragment.java            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/InstanceInfoFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/InstanceInfoFragment.java
index 180c3b899..1b4454486 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/InstanceInfoFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/InstanceInfoFragment.java
@@ -163,6 +163,7 @@ public class InstanceInfoFragment extends LoaderFragment {
 						instance = result;
 						bindViews();
 						dataLoaded();
+						invalidateOptionsMenu();
 						if(refreshing) {
 							refreshing = false;
 							refreshLayout.setRefreshing(false);
@@ -327,8 +328,10 @@ public class InstanceInfoFragment extends LoaderFragment {
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
-		inflater.inflate(R.menu.instance_info, menu);
-		UiUtils.enableOptionsMenuIcons(getActivity(), menu);
+		if (instance != null) {
+			inflater.inflate(R.menu.instance_info, menu);
+			UiUtils.enableOptionsMenuIcons(getActivity(), menu);
+		}
 	}
 
 	@Override