Apply ASSERT

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

diff --git a/src/data/FileInfo.cpp b/src/data/FileInfo.cpp
index 155f567..3ea0788 100644 (file)
--- a/src/data/FileInfo.cpp
+++ b/src/data/FileInfo.cpp
@@ -32,12 +32,10 @@ struct SFileInfo {
 
 bool CFileInfo::Create(void)
 {
-       if (m)
-               return false;
+       ASSERT(!m);
 
        m = new SFileInfo;
-       if (!m)
-               return false;
+       ASSERT(m);
 
        memset(m, 0, sizeof(SFileInfo));
 
@@ -53,8 +51,7 @@ bool CFileInfo::Create(void)
 
 void CFileInfo::Destroy(void)
 {
-       if (!m)
-               return;
+       ASSERT(m);
 
        CExtNameInfo::Destroy();
 
@@ -89,8 +86,7 @@ groups gType(media_content_type_e type)
 
 bool CFileInfo::Duplicate(CNameInfo* obj)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        if (!CExtNameInfo::Duplicate(obj))
                return false;
@@ -101,8 +97,7 @@ bool CFileInfo::Duplicate(CNameInfo* obj)
 
 bool CFileInfo::SetLoadInfo(media_info_h handle)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        m->handle = handle;
        return true;
@@ -110,8 +105,7 @@ bool CFileInfo::SetLoadInfo(media_info_h handle)
 
 bool CFileInfo::Load(void)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        bool ret = false;
        do {
@@ -158,10 +152,13 @@ bool CFileInfo::Load(void)
                if(str == NULL)
                {
                        _ERR("Fail to get string by media_info_get_thumbnail_path");
-                       break;
+                       //break;
+               }
+               else
+               {
+                       SetThumbnailPath(str);
+                       free(str);
                }
-               SetThumbnailPath(str);
-               free(str);
 
                TTime time;
                if (media_info_get_modified_time(m->handle, &time) != MEDIA_CONTENT_ERROR_NONE) {