summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-09-03 17:57:38 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-09-03 17:57:38 +0200
commit821460600690723043ec844b4187362ca758a6a3 (patch)
tree5d6e1d05d0f472b502525ac18190b11a81881db6
parentInclude all .moc files removed in the previous commit (diff)
downloadrekonq-821460600690723043ec844b4187362ca758a6a3.tar.xz
ok, it seems working now. But I'm not sure this is the right fix..
-rw-r--r--src/bookmarks/bookmarkowner.cpp2
-rw-r--r--src/bookmarks/bookmarkspanel.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp
index ece2e29f..f9e64d68 100644
--- a/src/bookmarks/bookmarkowner.cpp
+++ b/src/bookmarks/bookmarkowner.cpp
@@ -130,7 +130,7 @@ void BookmarkOwner::setCurrentBookmark(const KBookmark &bookmark)
void BookmarkOwner::unsetCurrentBookmark()
{
-// m_currentBookmark = KBookmark();
+ m_currentBookmark = KBookmark();
}
diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index 27c60e46..e11c0280 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -133,6 +133,9 @@ void BookmarksPanel::onExpand(const QModelIndex &index)
void BookmarksPanel::loadFoldedState(const QModelIndex &root)
{
QAbstractItemModel *model = panelTreeView()->model();
+ if(!model)
+ return;
+
int count = model->rowCount(root);
QModelIndex index;