From b2092cc64be2fd8fd5312f86711ef303510c25a1 Mon Sep 17 00:00:00 2001
From: Christian Dywan <christian@twotoasts.de>
Date: Mon, 4 Apr 2011 22:47:22 +0200
Subject: [PATCH] Move config folder validity check in front of app run

---
 midori/main.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 645e03e0..2f81158a 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1905,6 +1905,13 @@ main (int    argc,
     /* libSoup uses threads, so we need to initialize threads. */
     if (!g_thread_supported ()) g_thread_init (NULL);
     sokoke_register_stock_items ();
+
+    if (config && !g_path_is_absolute (config))
+    {
+        g_critical (_("The specified configuration folder is invalid."));
+        return 1;
+    }
+
     if (webapp && config)
         g_set_application_name (_("Midori (Private Browsing)"));
     else
@@ -2084,11 +2091,6 @@ main (int    argc,
     if (run)
         return midori_run_script (uris ? *uris : NULL);
 
-    if (config && !g_path_is_absolute (config))
-    {
-        g_critical (_("The specified configuration folder is invalid."));
-        return 1;
-    }
     sokoke_set_config_dir (config);
     if (config)
     {