From b08969ac3392798b5e6ae37982b51e45d8cffaf1 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 27 May 2014 20:31:18 -0700 Subject: Dive add: fix crash when canceling We need to reset the editMode right away, otherwise all the changes to the input field (when resetting the data after the user cancels) will cause Subsurface to crash as current_dive will temporarily be NULL. Signed-off-by: Dirk Hohndel --- qt-ui/maintab.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index f004737af..850528192 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -792,6 +792,7 @@ void MainTab::resetPallete() void MainTab::rejectChanges() { EditMode lastMode = editMode; + editMode = NONE; tabBar()->setTabIcon(0, QIcon()); // Notes tabBar()->setTabIcon(1, QIcon()); // Equipment @@ -874,7 +875,6 @@ void MainTab::rejectChanges() MainWindow::instance()->dive_list()->setEnabled(true); notesBackup.clear(); resetPallete(); - editMode = NONE; MainWindow::instance()->globe()->reload(); if (lastMode == ADD || lastMode == MANUALLY_ADDED_DIVE) { // more clean up -- cgit v1.2.3-70-g09d2