[Orxonox-commit 5764] r10424 - code/branches/core7/src/libraries/network

landauf at orxonox.net landauf at orxonox.net
Sun May 3 20:37:25 CEST 2015


Author: landauf
Date: 2015-05-03 20:37:25 +0200 (Sun, 03 May 2015)
New Revision: 10424

Modified:
   code/branches/core7/src/libraries/network/Client.cc
   code/branches/core7/src/libraries/network/LANDiscovery.cc
Log:
these Singletons are in fact required and not allowed to fail, otherwise the game crashes when clicking on the multiplayer button in the main menu

Modified: code/branches/core7/src/libraries/network/Client.cc
===================================================================
--- code/branches/core7/src/libraries/network/Client.cc	2015-05-03 15:14:47 UTC (rev 10423)
+++ code/branches/core7/src/libraries/network/Client.cc	2015-05-03 18:37:25 UTC (rev 10424)
@@ -56,7 +56,7 @@
 namespace orxonox
 {
 
-  ManageScopedSingleton( Client, ScopeID::Root, true );
+  ManageScopedSingleton( Client, ScopeID::Root, false );
 
   /**
   * Constructor for the Client class

Modified: code/branches/core7/src/libraries/network/LANDiscovery.cc
===================================================================
--- code/branches/core7/src/libraries/network/LANDiscovery.cc	2015-05-03 15:14:47 UTC (rev 10423)
+++ code/branches/core7/src/libraries/network/LANDiscovery.cc	2015-05-03 18:37:25 UTC (rev 10424)
@@ -37,7 +37,7 @@
 
 namespace orxonox
 {
-  ManageScopedSingleton(LANDiscovery, ScopeID::Graphics, true);
+  ManageScopedSingleton(LANDiscovery, ScopeID::Graphics, false);
 
   LANDiscovery::LANDiscovery()
   {




More information about the Orxonox-commit mailing list