merge with dev

2019-02-15 08:30:22 +01:00
parent 932d022f8e 8c7555f4a8
commit 03315b496a
3 changed files with 51 additions and 5 deletions
--- a/rtgui/previewloader.cc
+++ b/rtgui/previewloader.cc
@@ -59,7 +59,7 @@ public:
        };
    */
    struct JobCompare {
-        bool operator()(const Job& lhs, const Job& rhs)
+        bool operator()(const Job& lhs, const Job& rhs) const
        {
            if ( lhs.dir_id_ == rhs.dir_id_ ) {
                return lhs.dir_entry_ < rhs.dir_entry_;