From d05b934702f4d0c8c6c2157c5a9e4a327b82989b Mon Sep 17 00:00:00 2001 From: James Turner Date: Thu, 2 Feb 2017 17:02:39 +0100 Subject: [PATCH] Revert "Fixes for HUD, model-manager listeners." This reverts commit 831053bd043a2a65dfb92cce08bd14ec0604147c. See if this fixes the problem deleting models which Denk reported. --- src/Instrumentation/HUD/HUD.cxx | 1 - src/Model/modelmgr.cxx | 5 ----- 2 files changed, 6 deletions(-) diff --git a/src/Instrumentation/HUD/HUD.cxx b/src/Instrumentation/HUD/HUD.cxx index 1f3318144..722523fc7 100644 --- a/src/Instrumentation/HUD/HUD.cxx +++ b/src/Instrumentation/HUD/HUD.cxx @@ -82,7 +82,6 @@ HUD::Input::Input(const SGPropertyNode *n, float factor, float offset, } HUD::HUD() : - SGPropertyChangeListener(true /* recursive */), _currentPath(fgGetNode("/sim/hud/current-path", true)), _currentColor(fgGetNode("/sim/hud/current-color", true)), _visibility(fgGetNode("/sim/hud/visibility[1]", true)), diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx index 552e5d16b..6cbb6181a 100644 --- a/src/Model/modelmgr.cxx +++ b/src/Model/modelmgr.cxx @@ -277,11 +277,6 @@ FGModelMgr::Instance::~Instance () void FGModelMgr::Listener::childAdded(SGPropertyNode * parent, SGPropertyNode * child) { - if (!strcmp(parent->getName(), "models") && !strcmp(child->getName(), "model")) { - child->addChangeListener(this); - return; - } - if (strcmp(parent->getName(), "model") || strcmp(child->getName(), "load")) return;