Changeset 8646 for code/branches

Timestamp:

May 28, 2011, 7:35:35 PM (13 years ago)

Author:

rgrieder

Message:

Moved LANDiscovery singleton to Graphics Scope to fix the "host_ == NULL" problem.
Also fixed possible bug in d'tor.

File:

• code/branches/presentation/src/libraries/network/LANDiscovery.cc (modified) (2 diffs)

code/branches/presentation/src/libraries/network/LANDiscovery.cc

@@ -38 +38 @@
 namespace orxonox
 {
-  ManageScopedSingleton(LANDiscovery, ScopeID::Root, true);
+  ManageScopedSingleton(LANDiscovery, ScopeID::Graphics, true);
 
   LANDiscovery::LANDiscovery()
@@ -49 +49 @@
   LANDiscovery::~LANDiscovery()
   {
-    enet_host_destroy(this->host_);
+    if (this->host_ != NULL)
+      enet_host_destroy(this->host_);
   }