From dfc7ee0b296dd834b794d2f5be20924d6578a96a Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 3 Nov 2014 09:47:24 -0800 Subject: Delay replot of dive so changes aren't overwritten too early When changing tanks we triggered a replot - but that overwrote the displayed_dive with the current_dive before the remaining data from the displayed_dive was used to edit the current_dive. So now we delay this until later in the function, this way copy of paste of both tanks and weights works. Fixes #753 Signed-off-by: Dirk Hohndel --- qt-ui/maintab.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'qt-ui') diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index d79536427..d51c21fb0 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -663,6 +663,7 @@ void MainTab::acceptChanges() { int i, addedId = -1; struct dive *d; + bool do_replot = false; tabBar()->setTabIcon(0, QIcon()); // Notes tabBar()->setTabIcon(1, QIcon()); // Equipment ui.dateEdit->setEnabled(true); @@ -751,7 +752,7 @@ void MainTab::acceptChanges() ); for (int i = 0; i < MAX_CYLINDERS; i++) cd->cylinder[i] = displayed_dive.cylinder[i]; - MainWindow::instance()->graphics()->replot(); + do_replot = true; } if (weightModel->changed) { @@ -799,6 +800,8 @@ void MainTab::acceptChanges() emit addDiveFinished(); } else { editMode = NONE; + if (do_replot) + MainWindow::instance()->graphics()->replot(); MainWindow::instance()->dive_list()->rememberSelection(); sort_table(&dive_table); MainWindow::instance()->refreshDisplay(); -- cgit v1.2.3-70-g09d2