- Disallowed loading images when expecting is set.

- Added a cancel expect to the Stop button.

2 files changed, 3 insertions, 0 deletions

diff --git a/src/html.cc b/src/html.cc
index dfa51fdf..a9838aff 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -711,6 +711,8 @@ bool_t DilloHtml::unloadedImages()
  */
 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))) {
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 333773c1..0a7304dd 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -492,6 +492,7 @@ void a_UIcmd_stop(void *vbw)
    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);
 }