From a762ba5a164b34af6053ddfb0de9c15235be5dbd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 10 Nov 2011 23:17:18 +0100 Subject: [PATCH] Only look for missing speed dial thumbs in the first pass Otherwise updating after loading a thumb may trigger an infinite loop by looking for the very same thumb again. --- midori/midori-view.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index f064ce41..ca3a975e 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3651,7 +3651,8 @@ list_video_formats () } static gchar* -prepare_speed_dial_html (MidoriView* view) +prepare_speed_dial_html (MidoriView* view, + gboolean load_missing) { MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view)); GKeyFile* key_file; @@ -3742,7 +3743,8 @@ prepare_speed_dial_html (MidoriView* view) else { encoded = g_strdup (""); - midori_view_speed_dial_get_thumb (view, dial_entry, uri); + if (load_missing) + midori_view_speed_dial_get_thumb (view, dial_entry, uri); } g_free (thumb_file); @@ -3816,7 +3818,7 @@ midori_view_set_uri (MidoriView* view, katze_item_set_uri (view->item, ""); if (speeddial_markup == NULL) - speeddial_markup = prepare_speed_dial_html (view); + speeddial_markup = prepare_speed_dial_html (view, TRUE); midori_view_load_alternate_string (view, speeddial_markup, "about:blank", NULL); @@ -5530,7 +5532,7 @@ midori_view_save_speed_dial_config (MidoriView* view, sokoke_key_file_save_to_file (key_file, config_file, NULL); g_free (config_file); - katze_assign (speeddial_markup, prepare_speed_dial_html (view)); + katze_assign (speeddial_markup, prepare_speed_dial_html (view, FALSE)); while ((tab = midori_browser_get_nth_tab (browser, i++))) if (midori_view_is_blank (MIDORI_VIEW (tab))) -- 2.39.5