Changeset 9405 in orxonox.OLD for branches/proxy/src/lib/network/network_manager.cc

Timestamp:

Jul 24, 2006, 10:52:34 AM (18 years ago)

Author:

patrick

Message:

found server bug: initialization order inconsistency

File:

• branches/proxy/src/lib/network/network_manager.cc (modified) (3 diffs)

branches/proxy/src/lib/network/network_manager.cc

@@ -105 +105 @@
 int NetworkManager::createMasterServer(unsigned int port)
 {
+  // load the network settings
+  NetworkSettings::getInstance()->loadData();
+
   // create the network stream
   this->networkStream = new NetworkStream(NET_MASTER_SERVER);
@@ -123 +126 @@
 int NetworkManager::createProxyServer(unsigned int port)
 {
+  // load the network settings
+  NetworkSettings::getInstance()->loadData();
+
   // create the network stream
   this->networkStream = new NetworkStream(NET_PROXY_SERVER_ACTIVE);
@@ -148 +154 @@
 int NetworkManager::createClient(const std::string & name, unsigned int port)
 {
+  // load the network settings
+  NetworkSettings::getInstance()->loadData();
+
   // create the network stream
   this->networkStream = new NetworkStream(NET_CLIENT);