merge with dev

This commit is contained in:
Desmis
2018-12-11 07:40:54 +01:00
99 changed files with 2409 additions and 1833 deletions

View File

@@ -971,11 +971,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")) {