\r
import net.sf.openrocket.R;\r
import net.sf.openrocket.android.rocket.OpenRocketLoaderActivity;\r
-import android.content.Intent;\r
import android.os.Bundle;\r
import android.view.View;\r
import android.widget.Button;\r
\r
public class Main extends OpenRocketLoaderActivity {\r
\r
- public final static String restartFlag = "restart";\r
-\r
/** Called when the activity is first created. */\r
@Override\r
public void onCreate(Bundle icicle) {\r
super.onCreate(icicle);\r
- Intent i = getIntent();\r
- // Rocket already loaded. go to viewer unless we want to restart.\r
- if ( ( i.getBooleanExtra(restartFlag, false) == false) && CurrentRocketHolder.getCurrentRocket().getRocketDocument() != null ) {\r
- moveOnToViewer();\r
- }\r
setContentView(R.layout.main);\r
((Button) findViewById(R.id.main_open)).setOnClickListener(\r
new View.OnClickListener() {\r
});\r
}\r
\r
+ @Override\r
+ protected void onPostResume() {\r
+ super.onPostResume();\r
+ // Rocket already loaded.\r
+ if ( !isLoading() && CurrentRocketHolder.getCurrentRocket().getRocketDocument() != null ) {\r
+ moveOnToViewer();\r
+ }\r
+ }\r
+\r
@Override\r
public boolean onCreateOptionsMenu(Menu menu) {\r
MenuInflater inflater = getSupportMenuInflater();\r