Merge pull request #37 from captainssounds/bug/dbug-3rdparty-crash

Bug/dbug 3rdparty crash
mikeallisonJS · Aug 30, 2020 · 22cd09d · 22cd09d
2 parents 5aec520 + 2d4c642
commit 22cd09d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 1.0.7
+- Fix Dbug crashes on 3rd party non-CSModule modules
+
 ### 1.0.6
 - Cleaned up Dbug output
 - Fixed Several Dbug crash scenarios (core modules still causing issues)

diff --git a/plugin.json b/plugin.json
@@ -1,7 +1,7 @@
 {
   "slug": "CaptainsSounds",
   "name": "Captain's Sounds",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "license": "GPL-3.0-only",
   "brand": "Captain's Sounds",
   "author": "Mike Allison",

diff --git a/src/DBug.cpp b/src/DBug.cpp
@@ -67,8 +67,10 @@ bool DBugDisplay::isConnected() {
 
 bool DBugDisplay::isSafe() {
     // TODO: Better bad parent module testing. Sadly, model pointer slug & id do not dereference properly
-    // At least test that dbug isn't being nested
-    return module->leftExpander.module->model != modelDBug;
+    auto leftExpanderModule = module->leftExpander.module;
+    bool notNested = leftExpanderModule->model != modelDBug;
+    bool isDBugable = dynamic_cast<CSModule*>(leftExpanderModule) != nullptr;
+    return notNested && isDBugable;
 }
 
 Model* modelDBug = createModel<DBug, DBugWidget>("DBug");