Merge remote-tracking branch 'origin/dev' into std-mutex

2023-07-02 00:38:16 +02:00
parent c6206ac332 1d9225dfc3
commit 80a2d199db
627 changed files with 183057 additions and 28271 deletions
--- a/rtgui/thumbimageupdater.cc
+++ b/rtgui/thumbimageupdater.cc
@@ -47,8 +47,8 @@ public:
        Job(ThumbBrowserEntryBase* tbe, bool* priority, bool upgrade,
            ThumbImageUpdateListener* listener):
            tbe_(tbe),
-    /*pparams_(pparams),
-    height_(height), */
+            /*pparams_(pparams),
+            height_(height), */
            priority_(priority),
            upgrade_(upgrade),
            listener_(listener)