videocollection/videocollectionwrapper/src/videocollectionwrapper_p.cpp
changeset 46 adbe7d5ba2f5
parent 17 69946d1824c4
child 58 d2b028fd1f7d
--- a/videocollection/videocollectionwrapper/src/videocollectionwrapper_p.cpp	Fri Jun 11 13:39:54 2010 +0300
+++ b/videocollection/videocollectionwrapper/src/videocollectionwrapper_p.cpp	Wed Jun 23 18:14:16 2010 +0300
@@ -15,7 +15,7 @@
 * 
 */
 
-// Version : %version: %
+// Version : %version: 27 %
 
 // INCLUDE FILES
 #include <qapplication.h>
@@ -40,8 +40,10 @@
 VideoCollectionWrapperPrivate::VideoCollectionWrapperPrivate() 
     : mAllVideosModel( 0 )
     , mCollectionsModel( 0 )
+    , mCollectionContentModel( 0 )
     , mGenericModel( 0 )
     , mSourceModel( 0 )
+    , mAboutToClose( false )
 {
 	FUNC_LOG;
     // NOP 
@@ -54,7 +56,6 @@
 VideoCollectionWrapperPrivate::~VideoCollectionWrapperPrivate()
 {
 	FUNC_LOG;
-    // NOP here
 }
 
 
@@ -67,6 +68,11 @@
 	FUNC_LOG;
     INFO_1("VideoCollectionWrapperPrivate::getModel() type: %d", type);
 	
+    if(mAboutToClose)
+    {
+        return 0;
+    }
+    
     VideoSortFilterProxyModel *model = 0;
     if(!mSourceModel)
     {
@@ -143,6 +149,11 @@
     if(!mSourceModel.isNull())
     {
         delete mSourceModel;
+        delete mAllVideosModel;
+        delete mCollectionsModel;
+        delete mCollectionContentModel;
+        delete mGenericModel;
+        mAboutToClose = true;
     }
 }