aboutsummaryrefslogtreecommitdiffstats
path: root/qt-models
diff options
context:
space:
mode:
Diffstat (limited to 'qt-models')
-rw-r--r--qt-models/divepicturemodel.cpp4
-rw-r--r--qt-models/divetripmodel.cpp3
2 files changed, 4 insertions, 3 deletions
diff --git a/qt-models/divepicturemodel.cpp b/qt-models/divepicturemodel.cpp
index 799c49c0e..306030c4e 100644
--- a/qt-models/divepicturemodel.cpp
+++ b/qt-models/divepicturemodel.cpp
@@ -116,8 +116,10 @@ static bool removePictureFromSelectedDive(const char *fileUrl)
int i;
struct dive *dive;
for_each_dive (i, dive) {
- if (dive->selected && dive_remove_picture(dive, fileUrl))
+ if (dive->selected && remove_picture(&dive->pictures, fileUrl)) {
+ invalidate_dive_cache(dive);
return true;
+ }
}
return false;
}
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp
index 0af987191..73402cdad 100644
--- a/qt-models/divetripmodel.cpp
+++ b/qt-models/divetripmodel.cpp
@@ -302,8 +302,7 @@ QVariant DiveTripModelBase::diveData(const struct dive *d, int column, int role)
}
break;
case PHOTOS:
- if (d->picture_list)
- {
+ if (d->pictures.nr > 0) {
IconMetrics im = defaultIconMetrics();
return QIcon(icon_names[countPhotos(d)]).pixmap(im.sz_small, im.sz_small);
} // If there are photos, show one of the three photo icons: fish= photos during dive;