changeset 376:9be38a4a0b14

- Disallowed loading images when expecting is set. - Added a cancel expect to the Stop button.
author jcid
date Wed, 01 Oct 2008 23:15:03 +0200
parents 4634db37837d
children e22f6898fa6a
files src/html.cc src/uicmd.cc
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/html.cc	Wed Oct 01 22:39:06 2008 +0200
+++ b/src/html.cc	Wed Oct 01 23:15:03 2008 +0200
@@ -711,6 +711,8 @@
  */
 void DilloHtml::loadImages (const DilloUrl *pattern)
 {
+   dReturn_if_fail (bw->nav_expecting == FALSE);
+
    for (int i = 0; i < images->size(); i++) {
       if (images->get(i)->image) {
          if ((!pattern) || (!a_Url_cmp(images->get(i)->url, pattern))) {
--- a/src/uicmd.cc	Wed Oct 01 22:39:06 2008 +0200
+++ b/src/uicmd.cc	Wed Oct 01 23:15:03 2008 +0200
@@ -492,6 +492,7 @@
    BrowserWindow *bw = (BrowserWindow *)vbw;
 
    MSG("a_UIcmd_stop()\n");
+   a_Nav_cancel_expect(bw);
    a_Bw_stop_clients(bw, BW_Root + BW_Img + Bw_Force);
    a_UIcmd_set_buttons_sens(bw);
 }