summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2008-12-06 23:42:30 +0100
committerAndrea Diamantini <adjam7@gmail.com>2008-12-06 23:42:30 +0100
commit3349db61eed34e3c1fb274d66ac55405fa188fdc (patch)
treed663222a255d9f14743a19cba7f96ddda9979dd4
parentFixed Window Icon (diff)
downloadrekonq-3349db61eed34e3c1fb274d66ac55405fa188fdc.tar.xz
Fixed crash when closing rekonq with more than one tab
-rw-r--r--TODO1
-rw-r--r--src/browserapplication.cpp4
-rw-r--r--src/browsermainwindow.cpp3
3 files changed, 5 insertions, 3 deletions
diff --git a/TODO b/TODO
index c2ac09d0..2991ac44 100644
--- a/TODO
+++ b/TODO
@@ -5,6 +5,7 @@ Road to 0.0.1 (first release)
+ some porting
NEXT..
+- Fixing QByteArray save/load state!!
- system SELECT ALL
- better FULL SCREEN
- simplify history
diff --git a/src/browserapplication.cpp b/src/browserapplication.cpp
index 897037ab..8a1ffc5a 100644
--- a/src/browserapplication.cpp
+++ b/src/browserapplication.cpp
@@ -203,7 +203,7 @@ void BrowserApplication::clean()
void BrowserApplication::saveSession()
{
QWebSettings *globalSettings = QWebSettings::globalSettings();
- if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+ if ( globalSettings->testAttribute( QWebSettings::PrivateBrowsingEnabled ) )
return;
clean();
@@ -250,7 +250,7 @@ void BrowserApplication::restoreLastSession()
BrowserMainWindow *newWindow = 0;
if (m_mainWindows.count() == 1
&& mainWindow()->tabWidget()->count() == 1
- && mainWindow()->currentTab()->url() == QUrl())
+ && mainWindow()->currentTab()->url() == KUrl())
{
newWindow = mainWindow();
}
diff --git a/src/browsermainwindow.cpp b/src/browsermainwindow.cpp
index 3be8adf3..4f242225 100644
--- a/src/browsermainwindow.cpp
+++ b/src/browsermainwindow.cpp
@@ -162,7 +162,8 @@ QByteArray BrowserMainWindow::saveState(bool withTabs) const
stream << size();
// stream << !( statusBar()->isHidden() ); FIXME
if (withTabs)
- stream << tabWidget()->saveState();
+// stream << tabWidget()->saveState();
+ ;
else
stream << QByteArray();
return data;