}
}
}
- if (pSceneManager->GetCurrentSceneId() == pWindowInfo->sceneID && pWindowInfo->isJavascriptInitiated == true)
+ else
{
- r = SceneRegister::DestroyAndUnRegisterScene(pWindowInfo->sceneID);
- if (IsFailed(r))
- {
- AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
- return;
- }
- r = pAllWindowList->RemoveAt(count, true);
- __pWindowInfo = null;
- if (IsFailed(r))
- {
- AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
- return;
- }
- if(count > 0)
- {
- pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(count - 1));
- }
- else
- {
- pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(pAllWindowList->GetCount() - 1));
- }
- if (pWindowInfo == null)
+ if (pSceneManager->GetCurrentSceneId() == pWindowInfo->sceneID && pWindowInfo->isJavascriptInitiated == true)
{
- pApp = UiApp::GetInstance();
- if (pApp != null)
+ r = SceneRegister::DestroyAndUnRegisterScene(pWindowInfo->sceneID);
+ if (IsFailed(r))
{
- r = pApp->Terminate();
+ AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
return;
}
- }
- else
- {
- r = pSceneManager->GoBackward(BackwardSceneTransition(pWindowInfo->sceneID ,SCENE_TRANSITION_ANIMATION_TYPE_NONE));
+ r = pAllWindowList->RemoveAt(count, true);
+ __pWindowInfo = null;
if (IsFailed(r))
{
AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
return;
}
+ if(count > 0)
+ {
+ pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(count - 1));
+ }
+ else
+ {
+ pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(pAllWindowList->GetCount() - 1));
+ }
+ if (pWindowInfo == null)
+ {
+ pApp = UiApp::GetInstance();
+ if (pApp != null)
+ {
+ r = pApp->Terminate();
+ return;
+ }
+ }
+ else
+ {
+ r = pSceneManager->GoBackward(BackwardSceneTransition(pWindowInfo->sceneID ,SCENE_TRANSITION_ANIMATION_TYPE_NONE));
+ if (IsFailed(r))
+ {
+ AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
+ return;
+ }
+ }
+ break;
}
- break;
}
-
}
-
}
}
break;