[PATCH] Clear edit mode for manually added dives

Miika Turkia miika.turkia at gmail.com
Wed Feb 19 09:43:34 UTC 2014


Edit mode must be cleared for manually added dives as well when one hits
cancel or save.

Fixes #437

Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
I do not really know this part of the code, so am not confident I am
doing the right thing. Anyway, this does seem to fix the bug 437
according to my tests.
---
 qt-ui/maintab.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index d878a68..554b3cc 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -680,6 +680,7 @@ void MainTab::acceptChanges()
 		MainWindow::instance()->refreshDisplay();
 		MainWindow::instance()->dive_list()->restoreSelection();
 	}
+	DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING);
 	MainWindow::instance()->dive_list()->verticalScrollBar()->setSliderPosition(scrolledBy);
 	MainWindow::instance()->dive_list()->setFocus();
 }
@@ -803,8 +804,8 @@ void MainTab::rejectChanges()
 		MainWindow::instance()->showProfile();
 		// we already reloaded the divelist above, so don't recreate it or we'll lose the selection
 		MainWindow::instance()->refreshDisplay(false);
-		DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING);
 	}
+	DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING);
 	MainWindow::instance()->dive_list()->setFocus();
 }
 #undef EDIT_TEXT2
-- 
1.8.3.2



More information about the subsurface mailing list