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

Fixes crash when deleting all spots reporting by Desmis

Browse Source
This commit is contained in:
Pandagrapher
2019-01-10 20:49:37 +01:00
parent 8fb7e30bc5
commit 8699054ef0
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtgui/controlspotpanel.cc
View File

@@ -1203,6 +1203,12 @@ CursorShape ControlSpotPanel::getCursor(int objectID)
{ {
// printf("Object ID: %d\n", objectID); // printf("Object ID: %d\n", objectID);
// When there is no control spot (i.e. no selected row), objectID can unexpectedly be different from -1 and produced not desired behavior
const auto s = treeview_.get_selection();
if (!s->count_selected_rows()) {
return CSHandOpen;
}
int rem_ = objectID % 10; int rem_ = objectID % 10;
switch (rem_) { switch (rem_) {
@@ -1244,8 +1250,9 @@ CursorShape ControlSpotPanel::getCursor(int objectID)
bool ControlSpotPanel::mouseOver(int modifierKey) bool ControlSpotPanel::mouseOver(int modifierKey)
{ {
EditDataProvider* editProvider_ = getEditProvider(); EditDataProvider* editProvider_ = getEditProvider();
const auto s = treeview_.get_selection();
if (!editProvider_) { if (!editProvider_ || !s->count_selected_rows()) { // When there is no control spot (i.e. no selected row), objectID can unexpectedly be different from -1 and produced not desired behavior
return false; return false;
} }
@@ -1349,8 +1356,9 @@ bool ControlSpotPanel::button1Pressed(int modifierKey)
// printf("button1Pressed\n"); // printf("button1Pressed\n");
EditDataProvider *provider = getEditProvider(); EditDataProvider *provider = getEditProvider();
const auto s = treeview_.get_selection();
if (!provider || lastObject_ == -1) { if (!provider || lastObject_ == -1 || !s->count_selected_rows()) { // When there is no control spot (i.e. no selected row), objectID can unexpectedly be different from -1 and produced not desired behavior
return false; return false;
} }
@@ -1385,15 +1393,9 @@ bool ControlSpotPanel::drag1(int modifierKey)
// printf("drag1\n"); // printf("drag1\n");
EditDataProvider *provider = getEditProvider(); EditDataProvider *provider = getEditProvider();
if (!provider || lastObject_ == -1) {
return false;
}
// Get associated control spot
const auto s = treeview_.get_selection(); const auto s = treeview_.get_selection();
if (!s->count_selected_rows()) { if (!provider || lastObject_ == -1 || !s->count_selected_rows()) { // When there is no control spot (i.e. no selected row), objectID can unexpectedly be different from -1 and produced not desired behavior
return false; return false;
} }