[Xfce4-commits] <midori:master> Move config folder validity check in front of app run

[Christian Dywan]

Updating branch refs/heads/master
         to b2092cc64be2fd8fd5312f86711ef303510c25a1 (commit)
       from 2ffd780bb6079e4cdfee50fd5912a20e533a6903 (commit)

commit b2092cc64be2fd8fd5312f86711ef303510c25a1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Apr 4 22:47:22 2011 +0200

    Move config folder validity check in front of app run

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

diff --git a/midori/main.c b/midori/main.c
index 645e03e..2f81158 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)
     {