Merge branch 'master' into gtk3

2016-07-09 23:49:31 +02:00
parent 93360770e1 3b734e4a7a
commit 040962c1b7
49 changed files with 418 additions and 419 deletions
--- a/rtgui/profilestore.cc
+++ b/rtgui/profilestore.cc
@@ -252,7 +252,7 @@ bool ProfileStore::parseDir (Glib::ustring& realPath, Glib::ustring& virtualPath

 int ProfileStore::findFolderId(const Glib::ustring &path)
 {
-    for (std::vector<Glib::ustring>::iterator i = folders.begin(); i != folders.end(); i++) {
+    for (std::vector<Glib::ustring>::iterator i = folders.begin(); i != folders.end(); ++i) {
        if (*i == path) {
            return i - folders.begin();
        }