From ed8ad9ac807624b9fb87076e8a41cc2e47a5b076 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 21 Feb 2021 19:10:14 +0100 Subject: desktop: query DivePlannerPointsModel for planner state MainTab::updateDiveInfo() is not executed when in the planner. To decide whether the application is in the planner state, it queried the profile. Instead, query the DivePlannerPointsModel. Currently, there is no autoritative carrier of that flag. However, the MainTab has a dependency on DivePlannerPointsModel anyway, and therefore this removes a dependency on the profile. This brings us closer to a state where we can have multiple profiles. Ultimately, it is hoped that the whole check can be removed at this place, making the point moot. Signed-off-by: Berthold Stoeger --- desktop-widgets/tab-widgets/maintab.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'desktop-widgets/tab-widgets') diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index b849a3ead..295b13b1d 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -13,7 +13,6 @@ #include "qt-models/diveplannermodel.h" #include "desktop-widgets/divelistview.h" #include "core/selection.h" -#include "profile-widget/profilewidget2.h" #include "desktop-widgets/diveplanner.h" #include "qt-models/divecomputerextradatamodel.h" #include "qt-models/divelocationmodel.h" @@ -355,7 +354,7 @@ void MainTab::updateDiveInfo() { ui.location->refreshDiveSiteCache(); // don't execute this while adding / planning a dive - if (editMode || MainWindow::instance()->graphics->isPlanner()) + if (editMode || DivePlannerPointsModel::instance()->isPlanner()) return; // If there is no current dive, disable all widgets except the last two, -- cgit v1.2.3-70-g09d2