merge with dev...

2017-06-19 12:30:20 +02:00
parent f1a90dad54 a9f769c5d7
commit acd715dd44
90 changed files with 598 additions and 866 deletions
--- a/rtgui/thumbnail.cc
+++ b/rtgui/thumbnail.cc
@@ -823,7 +823,7 @@ void Thumbnail::_loadThumbnail(bool firstTrial)
        tpp->init ();
    }

-    if (!initial_ && tpp) {
+    if (!initial_) {
        tw = tpp->getImageWidth (getProcParamsU(), th, imgRatio);    // this might return 0 if image was just building
    }
 }