From 5afabfc9eb0a09539e97b15c24f92290549ccea9 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 28 May 2014 13:17:20 -0700 Subject: Planner: really fix crash after aborting planner Duh. We had to reload the list (and make sure the internal data structures are recreated as well) before restoring the selection. I also switched to simply accessing the widget directly, instead of via the dive_list() call. Signed-off-by: Dirk Hohndel --- qt-ui/mainwindow.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index a3247636e..82276f32e 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -247,7 +247,7 @@ void MainWindow::on_actionClose_triggered() while (dive_table.nr) delete_single_dive(0); - dive_list()->clearSelection(); + ui.ListWidget->clearSelection(); /* clear the selection and the statistics */ selected_dive = -1; @@ -401,13 +401,8 @@ void MainWindow::planCanceled() { removeFakeDiveForAddAndPlan(); showProfile(); - // restoring the selection causes a crash - somehow the model appears to be confused - // or maybe our internal data structures are messed up? - // commenting this out fixes the crash - // - // dive_list()->restoreSelection(); - - dive_list()->reload(DiveTripModel::CURRENT); + ui.ListWidget->reload(DiveTripModel::CURRENT); + ui.ListWidget->restoreSelection(); refreshDisplay(); } -- cgit v1.2.3-70-g09d2