From 7bbec8dbcb40e01ed59c262b50d7fe2564ffc8c1 Mon Sep 17 00:00:00 2001 From: James Turner Date: Sat, 23 Nov 2013 20:06:47 +0000 Subject: [PATCH] Reset: allow re-init of Nasal Ghosts. After discussion with Thomas, reset needs the scenario this assert was designed to guard against, so removing it for now. --- simgear/nasal/cppbind/Ghost.hxx | 2 -- 1 file changed, 2 deletions(-) diff --git a/simgear/nasal/cppbind/Ghost.hxx b/simgear/nasal/cppbind/Ghost.hxx index 3142979d..681c333d 100644 --- a/simgear/nasal/cppbind/Ghost.hxx +++ b/simgear/nasal/cppbind/Ghost.hxx @@ -291,8 +291,6 @@ namespace nasal */ static Ghost& init(const std::string& name) { - assert( !getSingletonPtr() ); - getSingletonHolder().reset( new Ghost(name) ); return *getSingletonPtr(); } -- 2.39.5