From e15f684207850eb6b42d7908b27d6c876f095540 Mon Sep 17 00:00:00 2001
From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Fri, 15 Jun 2012 14:09:55 +0000
Subject: [PATCH] Register the handler object in onResume so the application
 can restart correctly.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@781 180e2498-e6e9-4542-8430-84ac67f01cd8
---
 .../sf/openrocket/android/rocket/OpenRocketViewer.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
index 2ab9b63e..7f341dd6 100644
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
@@ -48,8 +48,6 @@ implements Simulations.OnSimulationSelectedListener
 		ViewPager viewPager = (ViewPager)findViewById(R.id.pager);
 		viewPagerAdapter = new OpenRocketViewerPagerAdapter( this.getSupportFragmentManager() );
 		viewPager.setAdapter( viewPagerAdapter );
-
-		CurrentRocketHolder.getCurrentRocket().setHandler( new RocketChangedEventHandler( ) );
 	}
 
 	@Override
@@ -58,6 +56,12 @@ implements Simulations.OnSimulationSelectedListener
 		super.onPause();
 	}
 
+	@Override
+	protected void onResume() {
+		CurrentRocketHolder.getCurrentRocket().setHandler( new RocketChangedEventHandler( ) );
+		super.onResume();
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater inflater = getSupportMenuInflater();
-- 
2.47.2