[Orxonox-commit 577] r3109 - in branches/ggz/src/orxonox: . gamestates

[adrfried at orxonox.net]

Author: adrfried
Date: 2009-05-29 20:05:17 +0200 (Fri, 29 May 2009)
New Revision: 3109

Modified:
   branches/ggz/src/orxonox/GGZClient.cc
   branches/ggz/src/orxonox/gamestates/GSClient.cc
Log:
segfault fixed

Modified: branches/ggz/src/orxonox/GGZClient.cc
===================================================================
--- branches/ggz/src/orxonox/GGZClient.cc	2009-05-28 22:46:24 UTC (rev 3108)
+++ branches/ggz/src/orxonox/GGZClient.cc	2009-05-29 18:05:17 UTC (rev 3109)
@@ -38,7 +38,6 @@
 
     void GGZClient::tick(const float /*dt*/)
     {
-        COUT(3) << "Tick\n";
         boost::system::error_code ec;
         io.poll(ec);
         if (ec)

Modified: branches/ggz/src/orxonox/gamestates/GSClient.cc
===================================================================
--- branches/ggz/src/orxonox/gamestates/GSClient.cc	2009-05-28 22:46:24 UTC (rev 3108)
+++ branches/ggz/src/orxonox/gamestates/GSClient.cc	2009-05-29 18:05:17 UTC (rev 3109)
@@ -101,7 +101,10 @@
     void GSClient::ticked(const Clock& time)
     {
         GSLevel::ticked(time);
-        client_->tick(time.getDeltaTime());
+        if(client_)
+        {
+            client_->tick(time.getDeltaTime());
+        }
 
         this->tickChild(time);
     }