diff options
| author | Ted Gould <ted@gould.cx> | 2009-12-21 16:37:12 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-12-21 16:37:12 +0000 |
| commit | 752a8f90d3442cdaa4689ba6de4b911ca4fda514 (patch) | |
| tree | 5e0739ec9bd2ac9cbdd2a2343859f89e02dae181 /src/main.cpp | |
| parent | Merging in from trunk (diff) | |
| parent | Updating the READMEs to better handle OSX. (diff) | |
| download | inkscape-752a8f90d3442cdaa4689ba6de4b911ca4fda514.tar.gz inkscape-752a8f90d3442cdaa4689ba6de4b911ca4fda514.zip | |
Updating to current trunk
(bzr r8254.1.38)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 8 |
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) |