diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2007-04-07 20:30:39 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2007-04-07 20:30:39 +0000 |
| commit | b229c41e9c48af93d7faaa8b033754f71237fe5a (patch) | |
| tree | d195f4dd518a9cc9f255ab9c3b090c746c64223e /desktop/history_core.c | |
| parent | cc0f1c7e281de4e0b0e7339df502ac6a5fba436b (diff) | |
| download | netsurf-b229c41e9c48af93d7faaa8b033754f71237fe5a.tar.gz netsurf-b229c41e9c48af93d7faaa8b033754f71237fe5a.tar.bz2 | |
1) Fix corruption of history data structure on cloning
2) Only destroy urldb's thumbnail bitmap if it's not the same as the new
one. This needs revisiting at a later date such that the mess
surrounding who owns bitmap objects is sorted (and so that urldb
doesn't need to know about bitmaps)
svn path=/trunk/netsurf/; revision=3243
Diffstat (limited to 'desktop/history_core.c')
| -rw-r--r-- | desktop/history_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/history_core.c b/desktop/history_core.c index b7d71c80e..0e7049dbe 100644 --- a/desktop/history_core.c +++ b/desktop/history_core.c @@ -124,7 +124,7 @@ struct history *history_clone(struct history *history) new_history->start = history_clone_entry(new_history, new_history->start); if (!history->start) { - LOG(("Insufficient memory to clone history")); + LOG(("Insufficient memory to clone history")); warn_user("NoMemory", 0); history_destroy(new_history); return 0; @@ -178,7 +178,7 @@ struct history_entry *history_clone_entry(struct history *history, for (child = new_entry->forward; child; child = child->next) { new_child = history_clone_entry(history, child); if (new_child) - new_child->back = entry; + new_child->back = new_entry; if (prev) prev->next = new_child; if (new_entry->forward == child) |