2 files changed, 31 insertions, 15 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 26fd81cf..33b419c8 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -146,7 +146,7 @@ struct Impl_DocumentWidget {
     iObjectList *  media;
     iString        sourceMime;
     iBlock         sourceContent; /* original content as received, for saving */
-    iGmDocument *  doc;    
+    iGmDocument *  doc;
     int            certFlags;
     iDate          certExpiry;
     iString *      certSubject;
@@ -782,7 +782,9 @@ void setRedirectCount_DocumentWidget(iDocumentWidget *d, int count) {
 }
 
 iBool isRequestOngoing_DocumentWidget(const iDocumentWidget *d) {
-    return d->state == fetching_RequestState || d->state == receivedPartialResponse_RequestState;
+    /*return d->state == fetching_RequestState ||
+            d->state == receivedPartialResponse_RequestState;*/
+    return d->request != NULL;
 }
 
 static void scroll_DocumentWidget_(iDocumentWidget *d, int offset) {
@@ -1072,12 +1074,12 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     }
     else if (equal_Command(cmd, "tabs.changed")) {
         d->showLinkNumbers = iFalse;
-        updateFetchProgress_DocumentWidget_(d);
         if (cmp_String(id_Widget(w), suffixPtr_Command(cmd, "id")) == 0) {
             /* Set palette for our document. */
             updateTheme_DocumentWidget_(d);
             updateTrust_DocumentWidget_(d, NULL);
             updateSize_DocumentWidget(d);
+            updateFetchProgress_DocumentWidget_(d);
         }
         updateWindowTitle_DocumentWidget_(d);
         allocVisBuffer_DocumentWidget_(d);
@@ -1160,7 +1162,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     else if (equalWidget_Command(cmd, w, "document.request.updated") &&
              pointerLabel_Command(cmd, "request") == d->request) {
         set_Block(&d->sourceContent, body_GmRequest(d->request));
-        updateFetchProgress_DocumentWidget_(d);
+        if (document_App() == d) {
+            updateFetchProgress_DocumentWidget_(d);
+        }
         checkResponse_DocumentWidget_(d);
         set_Atomic(&d->isRequestUpdated, iFalse); /* ready to be notified again */
         return iFalse;
@@ -1189,18 +1193,24 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         cancel_GmRequest(d->request);
         return iFalse;
     }
+    /*
     else if (equal_Command(cmd, "document.request.cancelled") && document_Command(cmd) == d) {
         postCommand_App("navigate.back");
         return iFalse;
     }
+    */
     else if (equal_Command(cmd, "media.updated") || equal_Command(cmd, "media.finished")) {
         return handleMediaCommand_DocumentWidget_(d, cmd);
     }
     else if (equal_Command(cmd, "document.stop") && document_App() == d) {
         if (d->request) {
-            postCommandf_App("document.request.cancelled doc:%p url:%s", d, cstr_String(d->mod.url));
+            postCommandf_App(
+                "document.request.cancelled doc:%p url:%s", d, cstr_String(d->mod.url));
             iReleasePtr(&d->request);
-            d->state = ready_RequestState;
+            if (d->state != ready_RequestState) {
+                d->state = ready_RequestState;
+                postCommand_App("navigate.back");
+            }
             updateFetchProgress_DocumentWidget_(d);
             return iTrue;
         }
@@ -1554,8 +1564,10 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                           'c',
                           KMOD_PRIMARY,
                           "copy" },
+                        { "---", 0, 0, NULL },
+                        { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
                     },
-                    6);
+                    8);
                 d->menu = makeMenu_Widget(w, data_Array(&items), size_Array(&items));
                 deinit_Array(&items);
             }
diff --git a/src/ui/util.c b/src/ui/util.c
index f1cab9ba..ff6f8822 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -243,6 +243,12 @@ iWidget *addAction_Widget(iWidget *parent, int key, int kmods, const char *comma
 
 /*-----------------------------------------------------------------------------------------------*/
 
+static iBool isCommandIgnoredByMenus_(const char *cmd) {
+    return equal_Command(cmd, "media.updated") || equal_Command(cmd, "document.request.updated") ||
+           equal_Command(cmd, "window.resized") ||
+           (equal_Command(cmd, "mouse.clicked") && !arg_Command(cmd)); /* button released */
+}
+
 static iBool menuHandler_(iWidget *menu, const char *cmd) {
     if (isVisible_Widget(menu)) {
         if (equalWidget_Command(cmd, menu, "menu.opened")) {
@@ -258,8 +264,7 @@ static iBool menuHandler_(iWidget *menu, const char *cmd) {
             closeMenu_Widget(menu);
             return iTrue;
         }
-        if (!equal_Command(cmd, "window.resized") &&
-            !(equal_Command(cmd, "mouse.clicked") && !arg_Command(cmd)) /* ignore button release */) {
+        if (!isCommandIgnoredByMenus_(cmd)) {
             closeMenu_Widget(menu);
         }
     }
@@ -734,10 +739,9 @@ void updateValueInput_Widget(iWidget *d, const char *title, const char *prompt)
 
 static iBool messageHandler_(iWidget *msg, const char *cmd) {
     /* Almost any command dismisses the sheet. */
-//    if (equal_Command(cmd, "menu.closed")) {
-//        return iFalse;
-//    }
-    destroy_Widget(msg);
+    if (!(equal_Command(cmd, "media.updated") || equal_Command(cmd, "document.request.updated"))) {
+        destroy_Widget(msg);
+    }
     return iFalse;
 }
 
@@ -808,7 +812,7 @@ iWidget *makePreferences_Widget(void) {
     addChild_Widget(dlg, iClob(page));
     setFlags_Widget(page, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
     iWidget *headings = addChildFlags_Widget(
-        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);    
+        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
     iWidget *values = addChildFlags_Widget(
         page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
     addChild_Widget(headings, iClob(makeHeading_Widget("Downloads folder:")));
@@ -817,7 +821,7 @@ iWidget *makePreferences_Widget(void) {
     addChild_Widget(headings, iClob(makeHeading_Widget("Use system theme:")));
     addChild_Widget(values, iClob(makeToggle_Widget("prefs.ostheme")));
 #endif
-    addChild_Widget(headings, iClob(makeHeading_Widget("Theme:")));    
+    addChild_Widget(headings, iClob(makeHeading_Widget("Theme:")));
     iWidget *themes = new_Widget();
     /* Themes. */ {
         setId_Widget(addChild_Widget(themes, iClob(new_LabelWidget("Pure Black", 0, 0, "theme.set arg:0"))), "prefs.theme.0");