Revert "Apply ASSERT"

[profile/tv/apps/native/filebrowser.git] / src / data / DirectoryInfo.cpp

diff --git a/src/data/DirectoryInfo.cpp b/src/data/DirectoryInfo.cpp
index d78e1a3..9ecbabe 100644 (file)
--- a/src/data/DirectoryInfo.cpp
+++ b/src/data/DirectoryInfo.cpp
@@ -35,10 +35,12 @@ struct SDirectoryInfo {
 
 bool CDirectoryInfo::Create(CNameInfo::EClassType type)
 {
-       ASSERT(!m);
+       if (m)
+               return false;
 
        m = new SDirectoryInfo;
-       ASSERT(m);
+       if (!m)
+               return false;
 
        if (!CExtNameInfo::Create(CLASS_TYPE_DIRECTORY)) {
                delete m;
@@ -52,7 +54,8 @@ bool CDirectoryInfo::Create(CNameInfo::EClassType type)
 
 void CDirectoryInfo::Destroy(void)
 {
-       ASSERT(m);
+       if (!m)
+               return;
 
        CExtNameInfo::Destroy();
 
@@ -63,7 +66,8 @@ void CDirectoryInfo::Destroy(void)
 
 bool CDirectoryInfo::SetCount(int nCount)
 {
-       ASSERT(m);
+       if (!m)
+               return false;
 
        m->nCount = nCount;
 
@@ -73,7 +77,8 @@ bool CDirectoryInfo::SetCount(int nCount)
 
 int CDirectoryInfo::Count(void)
 {
-       ASSERT(m);
+       if (!m)
+               return 0;
 
        return m->nCount;
 }
@@ -81,7 +86,8 @@ int CDirectoryInfo::Count(void)
 
 bool CDirectoryInfo::Duplicate(CNameInfo *obj)
 {
-       ASSERT(m);
+       if (!m)
+               return false;
 
        CDirectoryInfo *dst = (CDirectoryInfo*)obj;
 
@@ -114,7 +120,8 @@ static bool gFolderSize(media_info_h media_h, void *dt)
 
 bool CDirectoryInfo::SetLoadInfo(filter_h filter, media_folder_h folder)
 {
-       ASSERT(m);
+       if (!m)
+               return false;
 
        m->filter = filter;
        m->folder = folder;
@@ -125,7 +132,8 @@ bool CDirectoryInfo::SetLoadInfo(filter_h filter, media_folder_h folder)
 
 bool CDirectoryInfo::Load(void)
 {
-       ASSERT(m);
+       if (!m)
+               return false;
 
        int r;
        bool ret = false;