Changeset 10554

Timestamp:

Aug 29, 2015, 4:23:00 PM (9 years ago)

Author:

landauf

Message:

Gametype should store a WeakPtr to GametypeInfo to avoid circular reference if GametypeInfo references back to its Gametype

Location:

code/branches/core7/src/orxonox/gametypes

Files:

• Gametype.cc (modified) (2 diffs)
• Gametype.h (modified) (1 diff)

code/branches/core7/src/orxonox/gametypes/Gametype.cc

@@ -61 +61 @@
         RegisterObject(Gametype);
 
+        this->setGametype(SmartPtr<Gametype>(this, false));
+
         this->gtinfo_ = new GametypeInfo(context);
-
-        this->setGametype(SmartPtr<Gametype>(this, false));
+        this->gtinfo_->setGametype(this);
 
         this->defaultControllableEntity_ = Class(Spectator);
@@ -98 +99 @@
         if (this->isInitialized())
         {
-            this->gtinfo_->destroy();
+            if (this->gtinfo_)
+                this->gtinfo_->destroy();
 
             ModifyConsoleCommand(__CC_addBots_name).setObject(NULL);

code/branches/core7/src/orxonox/gametypes/Gametype.h

@@ -176 +176 @@
             virtual void importMementoState(const std::vector<GSLevelMementoState*>& states);
 
-            SmartPtr<GametypeInfo> gtinfo_;
+            WeakPtr<GametypeInfo> gtinfo_;
 
             bool bAutoStart_;