1 files changed, 9 insertions, 12 deletions

diff --git a/src/app.c b/src/app.c
index a76e135b..9a8e78ae 100644
--- a/src/app.c
+++ b/src/app.c
@@ -612,13 +612,14 @@ enum iColorTheme colorTheme_App(void) {
 
 const iString *schemeProxy_App(iRangecc scheme) {
     iApp *d = &app_;
+    const iString *proxy = NULL;
     if (equalCase_Rangecc(scheme, "gopher")) {
-        return &d->prefs.gopherProxy;
+        proxy = &d->prefs.gopherProxy;
     }
     if (equalCase_Rangecc(scheme, "http") || equalCase_Rangecc(scheme, "https")) {
-        return &d->prefs.httpProxy;
+        proxy = &d->prefs.httpProxy;
     }
-    return NULL;
+    return !isEmpty_String(proxy) ? proxy : NULL;
 }
 
 int run_App(int argc, char **argv) {
@@ -884,15 +885,7 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
 }
 
 iBool willUseProxy_App(const iRangecc scheme) {
-    iApp *d = &app_;
-    if (!isEmpty_String(&d->prefs.httpProxy) && (equalCase_Rangecc(scheme, "http") ||
-                                                 equalCase_Rangecc(scheme, "https"))) {
-        return iTrue;
-    }
-    if (!isEmpty_String(&d->prefs.gopherProxy) && equalCase_Rangecc(scheme, "gopher")) {
-        return iTrue;
-    }
-    return iFalse;
+    return schemeProxy_App(scheme) != NULL;
 }
 
 iBool handleCommand_App(const char *cmd) {
@@ -1203,6 +1196,10 @@ iBool handleCommand_App(const char *cmd) {
         save_Bookmarks(d->bookmarks, dataDir_App_);
         return iFalse;
     }
+    else if (equal_Command(cmd, "visited.changed")) {
+        save_Visited(d->visited, dataDir_App_);
+        return iFalse;
+    }
     else if (equal_Command(cmd, "ident.new")) {
         iWidget *dlg = makeIdentityCreation_Widget();
         setCommandHandler_Widget(dlg, handleIdentityCreationCommands_);