From 8db92cd08bc7ac7d7f52ebf7906c1d866c82e78a Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Tue, 31 Jul 2018 22:49:50 +0200 Subject: Fixing enviroments in win --- src/main.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 0cacc4b13..24fc93e0c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -622,20 +622,23 @@ static void set_datadir_env() { gchar const *xgd = g_getenv("XDG_DATA_DIRS"); #ifdef _WIN32 - Glib::ustring datadir = "'"; - datadir = get_datadir_path(); - datadir += "'"; - datadir += ":"; - datadir += "'"; +// Glib::ustring appdata = getenv("APPDATA"); +// Glib::ustring programfiles = getenv("ProgramFiles"); + Glib::ustring datadir = get_datadir_path(); + datadir += ";"; datadir += append_inkscape_datadir("inkscape"); - datadir += "'"; + if (xgd) { + datadir += ";"; + } #else Glib::ustring datadir = get_datadir_path(); datadir += ":"; datadir += append_inkscape_datadir("inkscape"); -#endif if (xgd) { datadir += ":"; + } +#endif + if (xgd) { datadir += xgd; } g_setenv("XDG_DATA_DIRS", datadir.c_str(), TRUE); -- cgit v1.2.3