"fix" a segfault where callbacks of no longer existing objects are ca…

…lled - but this is probably not a correct fix
diafero · May 10, 2014 · 1d890aa · 1d890aa
1 parent 9c0bd11
commit 1d890aa
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/core/PRP/Object/plSceneObject.cpp b/core/PRP/Object/plSceneObject.cpp
@@ -140,6 +140,7 @@ void plSceneObject::delModifier(size_t idx) {
     plKey key = fModifiers[idx];
     fModifiers.erase(fModifiers.begin() + idx);
 
+    key->clearCallbacks();
     if (key.isLoaded()) {
         if (key->getObj()->isStub()) {
             plDebug::Warning("WARNING:  Removing STUB modifier from SceneObject");
@@ -153,6 +154,7 @@ void plSceneObject::delModifier(size_t idx) {
 void plSceneObject::clearModifiers() {
     for (size_t i = 0; i < fModifiers.size(); i++) {
         plKey key = fModifiers[i];
+        key->clearCallbacks();
         if (key.isLoaded()) {
             if (key->getObj()->isStub()) {
                 plDebug::Warning("WARNING:  Removing STUB modifier from SceneObject");