summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorChris Morgan <chris.morganiser@gmail.com>2009-12-20 15:32:30 +0000
committerChris Morgan <chris.morganiser@gmail.com>2009-12-20 15:32:30 +0000
commitcd745f3d9831e013ba61a0197c802e1abf2368f8 (patch)
treeb4a5c2e7d0c0bcbadc7bb6730cab5fc99965b1a2 /src/main.cpp
parentWarning cleanup (diff)
downloadinkscape-cd745f3d9831e013ba61a0197c802e1abf2368f8.tar.gz
inkscape-cd745f3d9831e013ba61a0197c802e1abf2368f8.zip
Make Inkscape Portable not fiddle with the registry.
Fixed bugs: - https://launchpad.net/bugs/498801 (bzr r8896)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp8
1 files changed, 6 insertions, 2 deletions
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)