--- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsbackuprestorestate.cpp Fri Jun 11 13:30:16 2010 +0300
+++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsbackuprestorestate.cpp Wed Jun 23 18:03:36 2010 +0300
@@ -61,7 +61,7 @@
HsBackupRestoreObserver::instance();
connect(backupRestoreObserver,
- SIGNAL(event_backupRestoreComplited()),
+ SIGNAL(event_backupRestoreCompleted()),
SIGNAL(event_loadScene()));
// Close database
@@ -71,9 +71,8 @@
deleteIdleView();
// Delete scene
- HsScene *scene = HsScene::instance();
- delete scene;
-
+ HsScene::setInstance(0);
+
backupRestoreObserver->readyForBUR();
}
@@ -99,7 +98,9 @@
QScopedPointer<HbView> idleView(HsGui::takeIdleView());
if (idleView){
+ HbAction *navigationAction(idleView->navigationAction());
idleView->setNavigationAction(0);
+ delete navigationAction;
HsScene::mainWindow()->removeView(idleView.data());
}
}