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

Merge branch 'dev' into custom-tool-panel

Browse Source
This commit is contained in:
heckflosse
2018-11-29 14:12:46 +01:00
parent 883d967a03 b63b411bee
commit c8f6a05d04
53 changed files with 995 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/options.cc
View File

@@ -943,11 +943,17 @@ void Options::readFromFile(Glib::ustring fname)
}
if (keyFile.has_key("File Browser", "ParseExtensions")) {
parseExtensions = keyFile.get_string_list("File Browser", "ParseExtensions");
auto l = keyFile.get_string_list("File Browser", "ParseExtensions");
if (!l.empty()) {
parseExtensions = l;
}
}
if (keyFile.has_key("File Browser", "ParseExtensionsEnabled")) {
parseExtensionsEnabled = keyFile.get_integer_list("File Browser", "ParseExtensionsEnabled");
auto l = keyFile.get_integer_list("File Browser", "ParseExtensionsEnabled");
if (!l.empty()) {
parseExtensionsEnabled = l;
}
}
if (keyFile.has_key("File Browser", "ThumbnailArrangement")) {