liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: RT could crash while displaying Color Pickers (no issue)

Browse Source
This commit is contained in:
Hombre 2016-12-11 17:17:36 +01:00
parent 976fc087bd
commit 1f080e0438
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/cropwindow.cc
View File

@ -2083,10 +2083,15 @@ void CropWindow::updateHoveredPicker (rtengine::Coord *imgPos)
} }
LockableColorPicker::Validity validity = checkValidity (hoveredPicker, cropPos); LockableColorPicker::Validity validity = checkValidity (hoveredPicker, cropPos);
hoveredPicker->setValidity (validity); hoveredPicker->setValidity (validity);
{
MyMutex::MyLock lock(cropHandler.cimg);
if (validity == LockableColorPicker::Validity::INSIDE) { if (validity == LockableColorPicker::Validity::INSIDE) {
cropHandler.colorPick(cropPos, r, g, b, rpreview, gpreview, bpreview, hoveredPicker->getSize()); cropHandler.colorPick(cropPos, r, g, b, rpreview, gpreview, bpreview, hoveredPicker->getSize());
hoveredPicker->setRGB (r, g, b, rpreview, gpreview, bpreview); hoveredPicker->setRGB (r, g, b, rpreview, gpreview, bpreview);
} }
}
} }
void CropWindow::changeZoom (int zoom, bool notify, int centerx, int centery) void CropWindow::changeZoom (int zoom, bool notify, int centerx, int centery)
{ {
@ -2450,6 +2455,7 @@ void CropWindow::drawObservedFrame (Cairo::RefPtr<Cairo::Context> cr, int rw, in
void CropWindow::cropImageUpdated () void CropWindow::cropImageUpdated ()
{ {
MyMutex::MyLock lock(cropHandler.cimg);
for (auto colorPicker : colorPickers) { for (auto colorPicker : colorPickers) {
Coord imgPos, cropPos; Coord imgPos, cropPos;