From a896c5a87ca439f2551abcbd04942e7518a8a203 Mon Sep 17 00:00:00 2001
From: Kevin Ruland <kruland@sunflower.com>
Date: Fri, 15 Jun 2012 14:09:55 +0000
Subject: [PATCH] Register the handler object in onResume so the application
 can restart correctly.

---
 .../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 2ab9b63e2..7f341dd61 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();