Make custom URI handling work again

This changes the order custom and invalid URI checking so that items
set with custom_uri are still able to be handled properly, even if the
URI scheme is invalid (not whitelisted) and we don't want xombrero
opening it.

1 files changed, 7 insertions, 7 deletions

diff --git a/xombrero.c b/xombrero.c
index 529490e..e02f3ba 100644
--- a/xombrero.c
+++ b/xombrero.c
@@ -4967,13 +4967,6 @@ webview_npd_cb(WebKitWebView *wv, WebKitWebFrame *wf,
 
 	uri = (char *)webkit_network_request_get_uri(request);
 
-	if (valid_url_type(uri)) {
-		show_oops(t, "Stopping attempt to load an invalid URI (possible"
-		    " bait and switch attack)");
-		webkit_web_policy_decision_ignore(pd);
-		return (TRUE);
-	}
-
 	if (!auto_load_images && t->load_images) {
 
 		/* Disable autoloading of images, now that we're done loading
@@ -4996,6 +4989,13 @@ webview_npd_cb(WebKitWebView *wv, WebKitWebFrame *wf,
 		return (TRUE);
 	}
 
+	if (valid_url_type(uri)) {
+		show_oops(t, "Stopping attempt to load an invalid URI (possible"
+		    " bait and switch attack)");
+		webkit_web_policy_decision_ignore(pd);
+		return (TRUE);
+	}
+
 	if ((t->mode == XT_MODE_HINT && t->new_tab) || t->ctrl_click) {
 		t->ctrl_click = 0;
 		create_new_tab(uri, NULL, ctrl_click_focus, -1);