diff options
| author | David Robillard <d@drobilla.net> | 2014-07-13 02:10:39 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-07-13 02:10:39 +0000 |
| commit | 8a135425c9c74f1d886724ff3281c04b97b97412 (patch) | |
| tree | f030048fcb51ad8e4615830906399ce0d2c0ce92 /src | |
| parent | 1ab13614aa7506c22ee2e6c9a7893d7732c71da8 (diff) | |
| download | ingen-8a135425c9c74f1d886724ff3281c04b97b97412.tar.gz ingen-8a135425c9c74f1d886724ff3281c04b97b97412.tar.bz2 ingen-8a135425c9c74f1d886724ff3281c04b97b97412.zip | |
Only use old 2-argument version of Glib::build_filename (fix #971).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5408 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Configuration.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Configuration.cpp b/src/Configuration.cpp index 536be9d8..51aff65f 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -233,7 +233,8 @@ Configuration::save(URIMap& uri_map, // Save to file if it is absolute, otherwise save to user config dir std::string path = filename; if (!Glib::path_is_absolute(path)) { - path = Glib::build_filename(Glib::get_user_config_dir(), app, filename); + path = Glib::build_filename( + Glib::build_filename(Glib::get_user_config_dir(), app), filename); } // Create parent directories if necessary @@ -312,14 +313,15 @@ Configuration::load_default(const std::string& app, const std::vector<std::string> dirs = Glib::get_system_config_dirs(); for (auto d : dirs) { - const std::string path = Glib::build_filename(d, app, filename); + const std::string path = Glib::build_filename( + Glib::build_filename(d, app), filename); if (load(path)) { loaded.push_back(path); } } const std::string path = Glib::build_filename( - Glib::get_user_config_dir(), app, filename); + Glib::build_filename(Glib::get_user_config_dir(), app), filename); if (load(path)) { loaded.push_back(path); } |