Changeset 11021 for code/trunk

Timestamp:

Jan 2, 2016, 9:24:40 PM (9 years ago)

Author:

landauf

Message:

merged branch soundEffects back to trunk. for some reason it was never merged, even though its content is almost completely present in trunk (only the destruction of portalSound_ was missing)

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/portals/PortalEndPoint.cc (modified) (1 diff)

code/trunk/src/modules/portals/PortalEndPoint.cc

@@ -70 +70 @@
     PortalEndPoint::~PortalEndPoint()
     {
-        if(this->isInitialized() && this->trigger_ != NULL)
-            this->trigger_->destroy();
+        if (this->isInitialized()) {
+            if (this->trigger_ != NULL)
+                this->trigger_->destroy();
+
+            if (this->portalSound_ != NULL)
+                this->portalSound_->destroy();
+        }
     }