fix the crash problem when destorying the application

Change-Id: Ic395ce165b180240e53da1535e71baf1e2488927
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/src/layouts/FbAllLayout.cpp b/src/layouts/FbAllLayout.cpp
index beb3539..7401240 100644 (file)
--- a/src/layouts/FbAllLayout.cpp
+++ b/src/layouts/FbAllLayout.cpp
@@ -30,8 +30,8 @@ void CFbAllLayout::sm_CbUpdateEmptyFocusSequence(void* cookie)
                return;
 
        pfbBaseView = (CFbBaseView*)evas_object_data_get(eoBase, BASE_VIEW_DATA);
-       ASSERT(pfbBaseView);
-       pfbBaseView->UpdateEmptyFocusSequence();
+       if (pfbBaseView)
+               pfbBaseView->UpdateEmptyFocusSequence();
 }
 
 

diff --git a/src/layouts/FbMusicLayout.cpp b/src/layouts/FbMusicLayout.cpp
index dfcc9ce..08f8059 100644 (file)
--- a/src/layouts/FbMusicLayout.cpp
+++ b/src/layouts/FbMusicLayout.cpp
@@ -30,8 +30,8 @@ void CFbMusicLayout::sm_CbUpdateEmptyFocusSequence(void* cookie)
                return;
 
        pfbBaseView = (CFbBaseView*)evas_object_data_get(eoBase, BASE_VIEW_DATA);
-       ASSERT(pfbBaseView);
-       pfbBaseView->UpdateEmptyFocusSequence();
+       if (pfbBaseView)
+               pfbBaseView->UpdateEmptyFocusSequence();
 }
 
 

diff --git a/src/layouts/FbPhotoLayout.cpp b/src/layouts/FbPhotoLayout.cpp
index e5c1567..b291b86 100644 (file)
--- a/src/layouts/FbPhotoLayout.cpp
+++ b/src/layouts/FbPhotoLayout.cpp
@@ -29,8 +29,8 @@ void CFbPhotoLayout::sm_CbUpdateEmptyFocusSequence(void* cookie)
                return;
 
        pfbBaseView = (CFbBaseView*)evas_object_data_get(eoBase, BASE_VIEW_DATA);
-       ASSERT(pfbBaseView);
-       pfbBaseView->UpdateEmptyFocusSequence();
+       if (pfbBaseView)
+               pfbBaseView->UpdateEmptyFocusSequence();
 }
 
 

diff --git a/src/layouts/FbVideoLayout.cpp b/src/layouts/FbVideoLayout.cpp
index 57dce8c..039e199 100644 (file)
--- a/src/layouts/FbVideoLayout.cpp
+++ b/src/layouts/FbVideoLayout.cpp
@@ -30,8 +30,8 @@ void CFbVideoLayout::sm_CbUpdateEmptyFocusSequence(void* cookie)
                return;
 
        pfbBaseView = (CFbBaseView*)evas_object_data_get(eoBase, BASE_VIEW_DATA);
-       ASSERT(pfbBaseView);
-       pfbBaseView->UpdateEmptyFocusSequence();
+       if (pfbBaseView)
+               pfbBaseView->UpdateEmptyFocusSequence();
 }