[CTC][opengl][Non-ACR][TNEXT-2271,Fix add for crash issue]

Change-Id: I1662601b7a79b9a9383f93ea6e68980c56424c1a
Signed-off-by: nibha.sharma <nibha.sharma@samsung.com>

diff --git a/src/ctc/opengl/CTs-opengl.c b/src/ctc/opengl/CTs-opengl.c
index f4346d99e6130f04fc87265f1bb98f0b43ff0b61..e87bc2e4f0164c9f5ac1a1cc9324c034041a52e7 100755 (executable)
--- a/src/ctc/opengl/CTs-opengl.c
+++ b/src/ctc/opengl/CTs-opengl.c
@@ -55,9 +55,10 @@ void CTs_opengl_cleanup(void)
 #endif
        if (g_elm_init)
        {
+               OpenGl2ElmShutdown();
                elm_shutdown();
        }
-       FREE_MEMORY(g_pstGld);
+
        return;
 }
 
@@ -347,7 +348,7 @@ static void Opengl2_draw_gl_cb(Evas_Object *pEvasObj)
 
        if ( g_nOpenGl2FrameCount > MAX_FRAME_COUNT )
        {
-               OpenGl2ElmShutdown();
+               return;
        }
 }
 
@@ -491,7 +492,6 @@ int CTc_Opengl2_GlDrawCube_p(void)
        if ( g_pOpenGl2EOWin == NULL )
        {
                FPRINTF("[Line : %d][%s] elm_win_util_standard_add failed to add a window object with standard setup\\n", __LINE__, API_NAMESPACE);
-               OpenGl2ElmShutdown();
                return 1;
        }
        elm_win_autodel_set(g_pOpenGl2EOWin, EINA_TRUE);
@@ -502,7 +502,6 @@ int CTc_Opengl2_GlDrawCube_p(void)
        if ( pEOBX == NULL )
        {
                FPRINTF("[Line : %d][%s] elm_box_add failed to add box\\n", __LINE__, API_NAMESPACE);
-               OpenGl2ElmShutdown();
                return 1;
        }
        evas_object_size_hint_weight_set(pEOBX, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -513,14 +512,12 @@ int CTc_Opengl2_GlDrawCube_p(void)
        if ( pEOGL == NULL )
        {
                FPRINTF("[Line : %d][%s] elm_glview_add failed to add glview\\n", __LINE__, API_NAMESPACE);
-               OpenGl2ElmShutdown();
                return 1;
        }
        g_pstGld->pGLApi = elm_glview_gl_api_get(pEOGL);
        if ( g_pstGld->pGLApi == NULL )
        {
                FPRINTF("[Line : %d][%s] elm_glview_gl_api_get failed to get gl api\\n", __LINE__, API_NAMESPACE);
-               OpenGl2ElmShutdown();
                return 1;
        }
 
@@ -548,7 +545,6 @@ int CTc_Opengl2_GlDrawCube_p(void)
        if ( pEcoreAnim == NULL )
        {
                FPRINTF("[Line : %d][%s] ecore_animator_add failed to add animator\\n", __LINE__, API_NAMESPACE);
-               OpenGl2ElmShutdown();
                return 1;
        }
        evas_object_data_set(pEOGL, EVAS_OBJECT_DATA_KEY_02, pEcoreAnim);
@@ -564,7 +560,6 @@ int CTc_Opengl2_GlDrawCube_p(void)
                        g_eOpenGl2State == DEL_GL_FAILED ||
                        g_eOpenGl2State == ANIMATOR_DEL_FAILED )
                {
-                       OpenGl2ElmShutdown();
                        return 1;
                }
                
@@ -698,7 +693,6 @@ int CTc_Opengl2_OpenGlContextVersion_p(void)
        if ( g_pOpenGl2EOWin == NULL )
        {
                FPRINTF("[Line : %d][%s] elm_win_util_standard_add failed to add a window object with standard setup\\n", __LINE__, API_NAMESPACE);
-               OpenGl2ElmShutdown();
                return 1;
        }
        elm_win_autodel_set(g_pOpenGl2EOWin, EINA_TRUE);
@@ -707,7 +701,6 @@ int CTc_Opengl2_OpenGlContextVersion_p(void)
        if ( pEOBX == NULL )
        {
                FPRINTF("[Line : %d][%s] elm_box_add failed to add box\\n", __LINE__, API_NAMESPACE);
-               OpenGl2ElmShutdown();
                return 1;
        }
        evas_object_size_hint_weight_set(pEOBX, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -720,7 +713,6 @@ int CTc_Opengl2_OpenGlContextVersion_p(void)
                if ( pEOGL == NULL )
                {
                        FPRINTF("[Line : %d][%s] elm_glview_version_add for EVAS_GL_GLES_1_X is failed to add glview\\n", __LINE__, API_NAMESPACE);
-                       OpenGl2ElmShutdown();
                        return 1;
                }
        }
@@ -730,7 +722,6 @@ int CTc_Opengl2_OpenGlContextVersion_p(void)
                if ( pEOGL == NULL )
                {
                        FPRINTF("[Line : %d][%s] elm_glview_version_add for EVAS_GL_GLES_2_X is failed to add glview\\n", __LINE__, API_NAMESPACE);
-                       OpenGl2ElmShutdown();
                        return 1;
                }
        }
@@ -738,8 +729,6 @@ int CTc_Opengl2_OpenGlContextVersion_p(void)
        // Delete subobj as a resize object of window obj.
        elm_win_resize_object_del(g_pOpenGl2EOWin, pEOBX);
 
-       OpenGl2ElmShutdown();
-
        return 0;
 }