Merge branch 'dev' into iconcleanup4

2018-07-13 18:14:48 +02:00
parent 522495f4eb c30f03ea09
commit 10af344672
133 changed files with 5059 additions and 2715 deletions
--- a/rtgui/filebrowserentry.cc
+++ b/rtgui/filebrowserentry.cc
@@ -211,19 +211,8 @@ void FileBrowserEntry::procParamsChanged (Thumbnail* thm, int whoChangedIt)

 void FileBrowserEntry::updateImage (rtengine::IImage8* img, double scale, rtengine::procparams::CropParams cropParams)
 {
-
-    {
-        GThreadLock lock;
-
-        if ( feih == nullptr ||
-                feih->destroyed ) {
-            img->free();
-            return;
-        }
-
-        redrawRequests++;
-        feih->pending++;
-    }
+    redrawRequests++;
+    feih->pending++;

    struct tiupdate {
        FileBrowserEntryIdleHelper* feih;