Fixed stupid cast mistake in AbstractConfigObjectList. Addresses #194.

hmatuschek · Jan 20, 2022 · dd517d0 · dd517d0
1 parent ab231d2
commit dd517d0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/lib/configobject.cc b/lib/configobject.cc
@@ -985,9 +985,13 @@ AbstractConfigObjectList::onElementModified(ConfigItem *obj) {
 
 void
 AbstractConfigObjectList::onElementDeleted(QObject *obj) {
-  int idx = indexOf(qobject_cast<ConfigObject *>(obj));
-  if (0 <= idx)
+  // Use reinterpret cast here as the obj may already be destroyed and this all RTTI freed.
+  // We just use the pointer address to remove the element here.
+  int idx = indexOf(reinterpret_cast<ConfigObject *>(obj));
+  if (0 <= idx) {
+    _items.remove(idx);
     emit elementRemoved(idx);
+  }
 }
 
 

diff --git a/lib/configobject.hh b/lib/configobject.hh
@@ -165,7 +165,8 @@ protected:
   virtual bool populate(YAML::Node &node, const Context &context);
 
 signals:
-  /** Gets emitted once the config object is modified. */
+  /** Gets emitted once the config object is modified.
+   * The instance passed is the modified item, this event is passed up the config tree. */
   void modified(ConfigItem *obj);
   /** Gets emitted before clearing the item. */
   void beginClear();

diff --git a/lib/configreference.cc b/lib/configreference.cc
@@ -81,7 +81,10 @@ ConfigObjectReference::allow(const QMetaObject *elementType) {
 
 void
 ConfigObjectReference::onReferenceDeleted(QObject *obj) {
-  Q_UNUSED(obj)
+  // Check if destroyed obj is referenced one.
+  if (_object != reinterpret_cast<ConfigObject*>(obj))
+    return;
+  // If it is
   _object = nullptr;
   emit modified();
 }