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

Fix crash when resetting spot removal with drag

Browse Source 
Do not attempt to update non-existent spots immediately after resetting
the spot removal tool.
This commit is contained in:
Lawrence Lee 2021-05-22 17:51:54 -07:00
parent 76706ac276
commit a5de8920fb
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtgui/spot.cc
View File

@ -172,6 +172,7 @@ void Spot::resetPressed()
} }
} else { } else {
if (!spots.empty()) { if (!spots.empty()) {
EditSubscriber::action = EditSubscriber::Action::NONE;
spots.clear(); spots.clear();
activeSpot = -1; activeSpot = -1;
lastObject = -1; lastObject = -1;
@ -657,6 +658,10 @@ bool Spot::button3Released()
bool Spot::drag1 (int modifierKey) bool Spot::drag1 (int modifierKey)
{ {
if (EditSubscriber::action != EditSubscriber::Action::DRAGGING) {
return false;
}
EditDataProvider *editProvider = getEditProvider(); EditDataProvider *editProvider = getEditProvider();
int imW, imH; int imW, imH;
editProvider->getImageSize (imW, imH); editProvider->getImageSize (imW, imH);
@ -738,6 +743,10 @@ bool Spot::drag1 (int modifierKey)
bool Spot::drag3 (int modifierKey) bool Spot::drag3 (int modifierKey)
{ {
if (EditSubscriber::action != EditSubscriber::Action::DRAGGING) {
return false;
}
EditDataProvider *editProvider = getEditProvider(); EditDataProvider *editProvider = getEditProvider();
int imW, imH; int imW, imH;
editProvider->getImageSize (imW, imH); editProvider->getImageSize (imW, imH);