store virtual grid id on widget

Dewb · Dec 17, 2021 · 43f07e1 · 43f07e1
1 parent b5966ca
commit 43f07e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/virtualgrid/VirtualGridWidget.cpp b/src/virtualgrid/VirtualGridWidget.cpp
@@ -37,6 +37,7 @@ VirtualGridWidget::VirtualGridWidget(VirtualGridModule* module, unsigned w, unsi
         VirtualGridModule* grid = dynamic_cast<VirtualGridModule*>(module);
         assert(grid);
         GridConnectionManager::get()->registerGrid(grid);
+        id = grid->device.id;
     }
 
     float rackWidth = 0;
@@ -106,12 +107,7 @@ VirtualGridWidget::VirtualGridWidget(VirtualGridModule* module, unsigned w, unsi
 
 VirtualGridWidget::~VirtualGridWidget()
 {
-    if (module)
-    {
-        VirtualGridModule* grid = dynamic_cast<VirtualGridModule*>(module);
-        assert(grid);
-        GridConnectionManager::get()->deregisterGrid(grid->device.id);
-    }
+    GridConnectionManager::get()->deregisterGrid(id);
 }
 
 void VirtualGridWidget::draw(const DrawArgs& args)
@@ -179,5 +175,5 @@ void VirtualGridWidget::appendContextMenu(Menu * menu)
 
     menu->addChild(createMenuItem("Release Held Keys", "Ctrl+Click", [this]()
         { this->clearHeldKeys(); }));
-    menu->addChild(construct<MenuLabel>(&MenuLabel::text, model->name + " (" + grid->device.id + ")"));
+    menu->addChild(construct<MenuLabel>(&MenuLabel::text, model->name + " (" + id + ")"));
 }
diff --git a/src/virtualgrid/VirtualGridWidget.hpp b/src/virtualgrid/VirtualGridWidget.hpp
@@ -20,6 +20,7 @@ struct VirtualGridWidget : rack::app::ModuleWidget
 protected:
     friend struct VirtualGridKey;
     rack::Vec margins;
+    std::string id;
 };
 
 template <unsigned width, unsigned height>