aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudio Saavedra <csaavedra@igalia.com>2013-05-21 06:25:06 +0800
committerClaudio Saavedra <csaavedra@igalia.com>2013-05-21 06:26:58 +0800
commitabf19158a76fe9e6f944493b76d8a869d5e566b1 (patch)
treec2a4ef65c970ad0059d6b06dde89a9d70cc2b3ed
parent001b082f9d8afb3703aa0117c469bfa6e850c326 (diff)
downloadgsoc2013-epiphany-abf19158a76fe9e6f944493b76d8a869d5e566b1.tar
gsoc2013-epiphany-abf19158a76fe9e6f944493b76d8a869d5e566b1.tar.gz
gsoc2013-epiphany-abf19158a76fe9e6f944493b76d8a869d5e566b1.tar.bz2
gsoc2013-epiphany-abf19158a76fe9e6f944493b76d8a869d5e566b1.tar.lz
gsoc2013-epiphany-abf19158a76fe9e6f944493b76d8a869d5e566b1.tar.xz
gsoc2013-epiphany-abf19158a76fe9e6f944493b76d8a869d5e566b1.tar.zst
gsoc2013-epiphany-abf19158a76fe9e6f944493b76d8a869d5e566b1.zip
ephy-web-view: do not load the crash page for pages that have not been loaded yet
https://bugzilla.gnome.org/show_bug.cgi?id=699211
-rw-r--r--embed/ephy-web-view.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 1b414eaf5..1501e6662 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -871,10 +871,12 @@ process_crashed_cb (WebKitWebView *web_view, gpointer user_data)
EphyWebViewPrivate *priv = EPHY_WEB_VIEW (web_view)->priv;
g_return_if_fail (priv->show_process_crash_page_id == 0);
- priv->show_process_crash_page_id = g_idle_add_full (G_PRIORITY_LOW,
- (GSourceFunc)load_process_crashed_page_cb,
- web_view,
- NULL);
+
+ if (!ephy_embed_has_load_pending (EPHY_GET_EMBED_FROM_EPHY_WEB_VIEW (web_view)))
+ priv->show_process_crash_page_id = g_idle_add_full (G_PRIORITY_LOW,
+ (GSourceFunc)load_process_crashed_page_cb,
+ web_view,
+ NULL);
}
static void