1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java b/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java
index 29142f26f..5a1122c7a 100644
--- a/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java
@@ -71,7 +71,8 @@ public class ShareLocationActivity extends LocationActivity implements LocationL
         mSnackbar = findViewById(R.id.snackbar);
         TextView snackbarAction = findViewById(R.id.snackbar_action);
         snackbarAction.setOnClickListener(view -> startActivity(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)));
-
+        showLocation(null, null);
+        setShareButtonEnabled(false);
         requestLocationUpdates();
     }
 
@@ -95,6 +96,7 @@ public class ShareLocationActivity extends LocationActivity implements LocationL
         super.onResume();
         if (isLocationEnabled()) {
             this.mSnackbar.setVisibility(View.GONE);
+            showLocation(null, null);
         } else {
             this.mSnackbar.setVisibility(View.VISIBLE);
         }
@@ -159,7 +161,6 @@ public class ShareLocationActivity extends LocationActivity implements LocationL
             this.mShareButton.setEnabled(false);
             this.mShareButton.setTextColor(0x8a000000);
             this.mShareButton.setText(R.string.locating);
-            showLocation(null, null);
         }
     }