From: Chris Morgan <chris.morganiser@gmail.com>
Date: Sun, 20 Dec 2009 15:32:30 +0000 (+0530)
Subject: Make Inkscape Portable not fiddle with the registry.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f5394d3bac1d27ed34b58cc3253e0ace8a30283e;p=inkscape.git

Make Inkscape Portable not fiddle with the registry.
---

diff --git a/src/main.cpp b/src/main.cpp
index f96d99e11..75e882e99 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -566,8 +566,12 @@ main(int argc, char **argv)
     // TODO these should use xxxW() calls explicitly and convert UTF-16 <--> UTF-8
     SetCurrentDirectory(homedir.c_str());
     _win32_set_inkscape_env(homedir);
-    RegistryTool rt;
-    rt.setPathInfo();
+    // Don't touch the registry (works fine without it) for Inkscape Portable
+    gchar const *val = g_getenv("INKSCAPE_PORTABLE_PROFILE_DIR");
+    if (!val) {
+        RegistryTool rt;
+        rt.setPathInfo();
+    }
 #endif
 
     // Prevents errors like "Unable to wrap GdkPixbuf..." (in nr-filter-image.cpp for example)