Merge branch 'master' into gtk3

2016-08-06 21:32:49 +02:00
parent 705088dcd8 14b5bf1386
commit e4536f231b
1 changed files with 2 additions and 0 deletions
--- a/rtgui/thumbnail.cc
+++ b/rtgui/thumbnail.cc
@@ -499,6 +499,8 @@ void Thumbnail::decreaseRef ()

 void Thumbnail::getThumbnailSize (int &w, int &h, const rtengine::procparams::ProcParams *pparams)
 {
+    MyMutex::MyLock lock(mutex);
+
    int tw_ = tw;
    int th_ = th;
    float imgRatio_ = imgRatio;