Dispose future by setValue to nullptr.

create3000 · Oct 3, 2018 · f662b75 · f662b75
1 parent 1942c88
commit f662b75
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/libtitania-x3d/Titania/X3D/Browser/X3DBrowser.cpp b/libtitania-x3d/Titania/X3D/Browser/X3DBrowser.cpp
@@ -739,8 +739,7 @@ X3DBrowser::dispose ()
 	X3DBrowserContext::dispose ();
 	X3DBaseNode::dispose ();
 
-	if (future)
-		future -> dispose ();
+	future .setValue (nullptr);
 
 	supportedFields     .reset ();
 	supportedNodes      .reset ();

diff --git a/libtitania-x3d/Titania/X3D/Components/Networking/Inline.cpp b/libtitania-x3d/Titania/X3D/Components/Networking/Inline.cpp
@@ -372,8 +372,7 @@ Inline::traverse (const TraverseType type, X3DRenderObject* const renderObject)
 void
 Inline::dispose ()
 {
-	if (future)
-		future -> dispose ();
+	future .setValue (nullptr);
 
 	X3DUrlObject::dispose ();
 	X3DBoundedObject::dispose ();

diff --git a/libtitania-x3d/Titania/X3D/JavaScript/PeaseBlossom/Context.cpp b/libtitania-x3d/Titania/X3D/JavaScript/PeaseBlossom/Context.cpp
@@ -550,8 +550,7 @@ Context::setError (const pb::pbError & error) const
 void
 Context::dispose ()
 {
-	if (future)
-		future -> dispose ();
+	future .setValue (nullptr);
 
 	X3D::X3DJavaScriptContext::dispose ();
 }

diff --git a/libtitania-x3d/Titania/X3D/JavaScript/SpiderMonkey/Context.cpp b/libtitania-x3d/Titania/X3D/JavaScript/SpiderMonkey/Context.cpp
@@ -746,8 +746,7 @@ Context::error (JSContext* cx, const char* message, JSErrorReport* report)
 void
 Context::dispose ()
 {
-	if (future)
-		future -> dispose ();
+	future .setValue (nullptr);
 
 	X3DJavaScriptContext::dispose ();
 }

diff --git a/libtitania-x3d/Titania/X3D/Prototype/ExternProtoDeclaration.cpp b/libtitania-x3d/Titania/X3D/Prototype/ExternProtoDeclaration.cpp
@@ -726,8 +726,7 @@ ExternProtoDeclaration::toJSONStream (std::ostream & ostream) const
 void
 ExternProtoDeclaration::dispose ()
 {
-	if (future)
-		future -> dispose ();
+	future .setValue (nullptr);
 
 	getScene () -> removeExternProtoLoadCount (this);