diff options
Diffstat (limited to 'desktop-widgets/tab-widgets/maintab.cpp')
| -rw-r--r-- | desktop-widgets/tab-widgets/maintab.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 862578ba0..2d31c4536 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -669,6 +669,17 @@ void MainTab::acceptChanges() editMode = NONE; } +bool weightsystems_equal(const dive *d1, const dive *d2) +{ + if (d1->weightsystems.nr != d2->weightsystems.nr) + return false; + for (int i = 0; i < d1->weightsystems.nr; ++i) { + if (!same_weightsystem(d1->weightsystems.weightsystems[0], d2->weightsystems.weightsystems[i])) + return false; + } + return true; +} + void MainTab::rejectChanges() { EditMode lastMode = editMode; @@ -676,7 +687,7 @@ void MainTab::rejectChanges() if (lastMode != NONE && current_dive && (modified || memcmp(¤t_dive->cylinder[0], &displayed_dive.cylinder[0], sizeof(cylinder_t) * MAX_CYLINDERS) || - memcmp(¤t_dive->weightsystem[0], &displayed_dive.weightsystem[0], sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS))) { + !weightsystems_equal(current_dive, &displayed_dive))) { if (QMessageBox::warning(MainWindow::instance(), TITLE_OR_TEXT(tr("Discard the changes?"), tr("You are about to discard your changes.")), QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard) != QMessageBox::Discard) { |