Fixed crash when opening qupzilla:restore in multiple tabs.

closes #567
QupZilla · Sep 12, 2012 · 884c152 · 884c152
1 parent 5cf6b1c
commit 884c152
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/lib/session/recoverywidget.cpp b/src/lib/session/recoverywidget.cpp
@@ -26,15 +26,14 @@
 RecoveryWidget::RecoveryWidget(WebView* view, QupZilla* mainClass)
     : QWidget()
     , ui(new Ui::RecoveryWidget)
-    , m_restoreManager(mApp->restoreManager())
     , m_view(view)
     , p_QupZilla(mainClass)
 {
     ui->setupUi(this);
 
     setCursor(Qt::ArrowCursor);
 
-    const RestoreData &data = m_restoreManager->restoreData();
+    const RestoreData &data = mApp->restoreManager()->restoreData();
 
     for (int i = 0; i < data.size(); ++i) {
         const RestoreManager::WindowData &wd = data.at(i);
@@ -75,7 +74,12 @@ void RecoveryWidget::onItemChanged(QTreeWidgetItem* item, int column)
 
 void RecoveryWidget::restoreSession()
 {
-    RestoreData data = m_restoreManager->restoreData();
+    RestoreManager* manager = mApp->restoreManager();
+    if (!manager) {
+        return;
+    }
+
+    RestoreData data = manager->restoreData();
 
     for (int win = ui->treeWidget->topLevelItemCount() - 1; win >= 0; --win) {
         QTreeWidgetItem* root = ui->treeWidget->topLevelItem(win);

diff --git a/src/lib/session/recoverywidget.h b/src/lib/session/recoverywidget.h
@@ -30,7 +30,6 @@ class QTreeWidgetItem;
 
 class WebView;
 class QupZilla;
-class RestoreManager;
 
 class RecoveryWidget : public QWidget
 {
@@ -49,7 +48,6 @@ private slots:
 private:
     Ui::RecoveryWidget* ui;
 
-    RestoreManager* m_restoreManager;
     WebView* m_view;
     QupZilla* p_QupZilla;
 };