diff options
| author | Lorenz Haas <lykurg@gmail.com> | 2013-04-13 23:42:40 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-04-15 09:58:05 +0200 |
| commit | 462bda610e946c9519c0d8453d207075a223a82c (patch) | |
| tree | f188b40f656e89f927c15b02a1129e371f4a3ca1 /src/plugins/bookmarks | |
| parent | 0a79a50d067d8dd3179919544fdbcf8d0971d231 (diff) | |
| download | qt-creator-462bda610e946c9519c0d8453d207075a223a82c.tar.gz | |
Bookmarks: Fix loose bookmarks while loading file
The problem was, that while loading saved bookmarks, updateBookmark()
was called which automatically called saveBookmarks() even if the
pointer of the new bookmark was not put into m_bookmarksList. Thus the
bookmark was deleted.
Task-number: QTCREATORBUG-9116
Change-Id: I9cbdfc854e2bfa0dc448d96233ca76ee62417fe2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/bookmarks')
| -rw-r--r-- | src/plugins/bookmarks/bookmarkmanager.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index fe2f37ce22..642da49846 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -432,7 +432,10 @@ void BookmarkManager::toggleBookmark(const QString &fileName, int lineNumber) void BookmarkManager::updateBookmark(Bookmark *bookmark) { - int idx = m_bookmarksList.indexOf(bookmark); + const int idx = m_bookmarksList.indexOf(bookmark); + if (idx == -1) + return; + emit dataChanged(index(idx, 0, QModelIndex()), index(idx, 2, QModelIndex())); saveBookmarks(); } |