Fix access to deleted dashboard

Use shared_ptr instead of raw pointers.
fair-acc · Oct 1, 2024 · 0c643ea · 0c643ea
1 parent 750ce03
commit 0c643ea
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/ui/Dashboard.hpp b/src/ui/Dashboard.hpp
@@ -109,7 +109,7 @@ class Dashboard : public std::enable_shared_from_this<Dashboard> {
     inline auto& plots() { return m_plots; }
 
     void                         setNewDescription(const std::shared_ptr<DashboardDescription>& desc);
-    inline DashboardDescription* description() const { return m_desc.get(); }
+    inline std::shared_ptr<DashboardDescription> description() const { return m_desc; }
 
     struct Service {
         Service(std::string n, std::string u) : name(std::move(n)), uri(std::move(u)) {}

diff --git a/src/ui/OpenDashboardPage.cpp b/src/ui/OpenDashboardPage.cpp
@@ -110,7 +110,7 @@ void OpenDashboardPage::unsubscribeSource(const std::shared_ptr<DashboardSource>
 static constexpr float indent = 20;
 
 //
-void OpenDashboardPage::dashboardControls(Dashboard* optionalDashboard) {
+void OpenDashboardPage::dashboardControls(const std::shared_ptr<Dashboard>& optionalDashboard) {
     IMW::Font titleFont(LookAndFeel::instance().fontBigger[LookAndFeel::instance().prototypeMode]);
 
     if (optionalDashboard) {
@@ -144,7 +144,7 @@ void OpenDashboardPage::dashboardControls(Dashboard* optionalDashboard) {
     }
 }
 
-void OpenDashboardPage::draw(Dashboard* optionalDashboard) {
+void OpenDashboardPage::draw(const std::shared_ptr<Dashboard>& optionalDashboard) {
     ImGui::Spacing();
 
     dashboardControls(optionalDashboard);
@@ -292,7 +292,7 @@ void OpenDashboardPage::draw(Dashboard* optionalDashboard) {
 
             const auto& name              = item.first->name;
             const auto& source            = item.first->source;
-            bool        isDashboardActive = optionalDashboard && name == optionalDashboard->description()->name && source == optionalDashboard->description()->source;
+            bool        isDashboardActive = optionalDashboard && optionalDashboard->description() && name == optionalDashboard->description()->name && source == optionalDashboard->description()->source;
 
             {
                 IMW::Font font(isDashboardActive ? LookAndFeel::instance().fontIconsSolid : LookAndFeel::instance().fontIcons);

diff --git a/src/ui/OpenDashboardPage.hpp b/src/ui/OpenDashboardPage.hpp
@@ -21,15 +21,15 @@ class OpenDashboardPage {
     std::function<void()>                                              requestCloseDashboard;
     std::function<void(const std::shared_ptr<DashboardDescription> &)> requestLoadDashboard;
 
-    void                                                               draw(Dashboard *optionalDashboard);
+    void                                                               draw(const std::shared_ptr<Dashboard>& optionalDashboard);
 
     void                                                               addSource(std::string_view path);
     void                                                               addDashboard(const std::shared_ptr<DashboardSource> &source, const auto &n);
 
     std::shared_ptr<DashboardDescription>                              get(const size_t index);
 
 private:
-    void                                               dashboardControls(Dashboard *optionalDashboard);
+    void                                               dashboardControls(const std::shared_ptr<Dashboard>& optionalDashboard);
     void                                               drawAddSourcePopup();
     void                                               unsubscribeSource(const std::shared_ptr<DashboardSource> &source);
 

diff --git a/src/ui/main.cpp b/src/ui/main.cpp
@@ -465,7 +465,7 @@ static void main_loop(void* arg) {
                 }
             }
         } else if (app->mainViewMode == ViewMode::OPEN_SAVE_DASHBOARD) {
-            app->openDashboardPage.draw(app->dashboard.get());
+            app->openDashboardPage.draw(app->dashboard);
         } else {
             fmt::print("unknown view mode {}\n", static_cast<int>(app->mainViewMode));
         }