summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2017-02-05 10:43:58 +0000
committerDaniel Silverstone <dsilvers@digital-scurf.org>2017-02-05 10:43:58 +0000
commit10f1b7a1aaec183defb6ae724576910494026954 (patch)
treea9c65ea8ec435ff1d5cc311d2697057cdf57f010
parent1f52b2d514ac12bfbcb97f4ed3eb556d5e38739d (diff)
downloadnetsurf-10f1b7a1aaec183defb6ae724576910494026954.tar.gz
netsurf-10f1b7a1aaec183defb6ae724576910494026954.tar.bz2
Fix up GTK+ hotlist finalisation to clean up properly
-rw-r--r--frontends/gtk/gui.c6
-rw-r--r--frontends/gtk/hotlist.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index c08ab0ae4..8d6b42234 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -449,6 +449,12 @@ static void gui_quit(void)
messages_get_errorcode(res));
}
+ res = hotlist_fini(nsoption_charp(hotlist_path));
+ if (res != NSERROR_OK) {
+ LOG("Error finalising hotlist: %s",
+ messages_get_errorcode(res));
+ }
+
free(nsgtk_config_home);
gtk_fetch_filetype_fin();
diff --git a/frontends/gtk/hotlist.c b/frontends/gtk/hotlist.c
index 6ce9060fb..34a13772d 100644
--- a/frontends/gtk/hotlist.c
+++ b/frontends/gtk/hotlist.c
@@ -398,7 +398,7 @@ nserror nsgtk_hotlist_destroy(void)
return NSERROR_OK;
}
- res = hotlist_fini(nsoption_charp(hotlist_path));
+ res = hotlist_manager_fini();
if (res == NSERROR_OK) {
res = nsgtk_corewindow_fini(&hotlist_window->core);
gtk_widget_destroy(GTK_WIDGET(hotlist_window->wnd));