Changeset 112

Timestamp:

08/09/10 16:54:17 (18 months ago)

Author:

Carsten

Message:

CaWE: Minor changes found in the course of implementing the first set of changes for the main objective (ticket #34).

Location:

cafu/branches/cafu_to_wx/CaWE

Files:

• AppCaWE.cpp (modified) (1 diff)
• ParentFrame.cpp (modified) (1 diff)

cafu/branches/cafu_to_wx/CaWE/AppCaWE.cpp

@@ -220 +220 @@
     m_FileConfig=NULL;
 
-    // TODO: delete cf::FileSys::FileMan;   // Shoud have   cf::FileSys::FileMan=new cf::FileSys::FileManImplT;   in OnInit().
-    cf::FileSys::FileMan=NULL;
-
     ConsoleInterpreter=NULL;     // This is very important, to make sure that no ConFuncT or ConVarT dtor accesses the ConsoleInterpreter that might already have been destroyed then.
 

cafu/branches/cafu_to_wx/CaWE/ParentFrame.cpp

@@ -194 +194 @@
 
     // Release the Cafu Material System.
-    MatSys::TextureMapManager->FreeTextureMap(m_WhiteTexture);
-    MatSys::TextureMapManager=NULL;
+    if (MatSys::TextureMapManager!=NULL)
+    {
+        MatSys::TextureMapManager->FreeTextureMap(m_WhiteTexture);
+        MatSys::TextureMapManager=NULL;
+    }
 
     if (MatSys::Renderer!=NULL)