X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=android%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fandroid%2FMain.java;h=7b6eb48e3e39a03e34205d3cfa1c9d04824ea2b9;hb=121456e8dbb3d43058bdc5aa74d59a4e08d06e81;hp=9c94130da2a8055950227993648122120900d788;hpb=e2dfe5a21739dd6a55ab6a1fe5382d912e83238d;p=debian%2Fopenrocket

diff --git a/android/src/net/sf/openrocket/android/Main.java b/android/src/net/sf/openrocket/android/Main.java
index 9c94130d..7b6eb48e 100644
--- a/android/src/net/sf/openrocket/android/Main.java
+++ b/android/src/net/sf/openrocket/android/Main.java
@@ -2,7 +2,6 @@ package net.sf.openrocket.android;
 
 import net.sf.openrocket.R;
 import net.sf.openrocket.android.rocket.OpenRocketLoaderActivity;
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -13,17 +12,10 @@ import com.actionbarsherlock.view.MenuItem;
 
 public class Main extends OpenRocketLoaderActivity {
 
-	public final static String restartFlag = "restart";
-
 	/** Called when the activity is first created. */
 	@Override
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
-		Intent i = getIntent();
-		// Rocket already loaded.  go to viewer unless we want to restart.
-		if ( ( i.getBooleanExtra(restartFlag, false) == false)  && CurrentRocketHolder.getCurrentRocket().getRocketDocument() != null ) {
-			moveOnToViewer();
-		}
 		setContentView(R.layout.main);
 		((Button) findViewById(R.id.main_open)).setOnClickListener(
 				new View.OnClickListener() {
@@ -48,6 +40,15 @@ public class Main extends OpenRocketLoaderActivity {
 				});
 	}
 
+	@Override
+	protected void onPostResume() {
+		super.onPostResume();
+		// Rocket already loaded.
+		if ( !isLoading() && CurrentRocketHolder.getCurrentRocket().getRocketDocument() != null ) {
+			moveOnToViewer();
+		}
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater inflater = getSupportMenuInflater();