Merge branch 'master' into gtk3

2017-01-22 21:55:05 +01:00
parent 9b2ab510f1 20e3f89abe
commit 5fc26c1e58
11 changed files with 83 additions and 54 deletions
--- a/rtgui/profilestore.cc
+++ b/rtgui/profilestore.cc
@@ -284,8 +284,8 @@ const ProfileStoreEntry* ProfileStore::findEntryFromFullPathU(Glib::ustring path
    if (
        lastdot_pos != Glib::ustring::npos
        && lastdot_pos <= casefolded_path.size() - 4
-        && !casefolded_path.compare(lastdot_pos, 4, paramFileExtension))
-    {
+        && !casefolded_path.compare(lastdot_pos, 4, paramFileExtension)
+    ) {
        // removing the extension
        // now use dot position without casefold()
        path = path.substr(0, path.find_last_of('.'));