Fixed Nabi Issues: 53721,53372,53761,53768

[apps/osp/Internet.git] / src / IntInternetApp.cpp

diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp
index abbb349..e08e942 100644 (file)
--- a/src/IntInternetApp.cpp
+++ b/src/IntInternetApp.cpp
@@ -47,7 +47,7 @@ static const wchar_t* APPCONTROL_OPERATION_ID_IMAGE_VIEWER = L"http://tizen.org/
 const int MIN_MEMORY_NEEDED = 1048576;
 
 InternetApp::InternetApp(void)
-: __pMultiWindowManager(NULL),__pNewWindowInfo(null),pSceneManagementFrame(null),__value(null),__isShowMsg(false)
+: __pMultiWindowManager(NULL),__pNewWindowInfo(null),pSceneManagementFrame(null),__value(null),__isShowMsg(false),__pAc(null)
 {
 }
 
@@ -176,15 +176,21 @@ InternetApp::OnAppInitialized(void)
 
        if (__operationId.CompareTo(L"http://tizen.org/appcontrol/operation/main") == 0)
        {
-
-               AppControl* pAc = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_IMAGE_VIEWER,
+               if(__pAc)
+               {
+                       r =__pAc->Stop();
+                       AppLog("AppControl Stop Result %s",GetErrorMessage(r));
+                       delete __pAc;
+                       __pAc = null;
+               }
+               __pAc = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_IMAGE_VIEWER,
                                APPCONTROL_OPERATION_ID_IMAGE_VIEWER);
-               if (pAc && __value && __value->GetLength() > 0)
+               if (__pAc && __value && __value->GetLength() > 0)
                {
                        AppLog("17jul __value is %S", __value->GetPointer());
-                       if (pAc->Start(__value, null, null, null) == E_SUCCESS)
+                       if (__pAc->Start(__value, null, null, null) == E_SUCCESS)
                        {
-                               delete pAc;
+//                             delete pAc;
                        }
                        delete __value;
                        __value = null;
@@ -449,14 +455,21 @@ InternetApp::OnAppControlRequestReceived(RequestId reqId, const String &operatio
                                String typeVal = APPCONTROL_SELECT_VALUE_IMAGE;
                                extraData.Add(&typeKey, &typeVal);
 
-                               AppControl* pAc = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_IMAGE_VIEWER,
+                               if(__pAc)
+                               {
+                                       result r = __pAc->Stop();
+                                       AppLog("AppControl Stop Result %s",GetErrorMessage(r));
+                                       delete __pAc;
+                                       __pAc = null;
+                               }
+                               __pAc = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_IMAGE_VIEWER,
                                                APPCONTROL_OPERATION_ID_IMAGE_VIEWER);
-                               if (pAc)
+                               if (__pAc)
                                {
                                        AppLog("17jul __value is %S", __value->GetPointer());
-                                       if (pAc->Start(__value, null, null, null) == E_SUCCESS)
+                                       if (__pAc->Start(__value, null, null, null) == E_SUCCESS)
                                        {
-                                               delete pAc;
+//                                             delete pAc;
                                        }
                                }
                                delete __value;