1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
index 2fedee3..79ae2da 100644
--- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
+++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
@@ -69,6 +69,8 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
         mSetupData = (CMSetupWizardData)getLastNonConfigurationInstance();
         if (mSetupData == null) {
             mSetupData = new CMSetupWizardData(this);
+        } else {
+            mSetupData.setContext(this);
         }
         mNextButton = (Button) findViewById(R.id.next_button);
         mPrevButton = (Button) findViewById(R.id.prev_button);
@@ -128,6 +130,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
                 | View.SYSTEM_UI_FLAG_IMMERSIVE
                 | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
         super.onResume();
+        mSetupData.onResume();
         onPageTreeChanged();
         enableButtonBar(true);
     }
@@ -135,6 +138,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        mSetupData.onDestroy();
         mSetupData.unregisterListener(this);
         unregisterReceiver(mSetupData);
     }
@@ -237,6 +241,11 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
     }
 
     @Override
+    public boolean isCurrentPage(Page page) {
+        return mSetupData.isCurrentPage(page);
+    }
+
+    @Override
     public void onFinish() {
         animateOut();
     }