liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into flatfield_monochrom

Browse Source
This commit is contained in:
heckflosse
2018-03-11 00:27:35 +01:00
parent 84f46eaab6 191a139445
commit 0c5714952d
5 changed files with 60 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/profilestore.cc
View File

@@ -121,11 +121,14 @@ void ProfileStore::_parseProfiles ()
Glib::ustring p2 = options.getGlobalProfilePath();
bool displayLevel0 = options.useBundledProfiles && !p1.empty() && !p2.empty() && p1 != p2;
Glib::ustring virtualPath ("${U}");
Glib::ustring currDir ("${U}");
parseDir (p1, virtualPath, currDir, 0, 0, displayLevel0);
if (displayLevel0) {
Glib::ustring virtualPath;
Glib::ustring currDir;
if (!p1.empty()) {
virtualPath = "${U}";
currDir = "${U}";
parseDir (p1, virtualPath, currDir, 0, 0, displayLevel0);
}
if (p1.empty() || displayLevel0) {
virtualPath = "${G}";
currDir = "${G}";
parseDir (p2, virtualPath, currDir, 0, 0, displayLevel0);