Fixed Nabi Issues

Change-Id: I3f75c70997af7a8920ee0fc1fbeb5039ef9fb256
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index c45bfc5..7b84d7d 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -2797,6 +2797,10 @@ MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                {
                        LoadUrl(__pWindowInfo->pageUrl);
                }
+               else if(__pWindowInfo->pageUrl.GetLength() > 0 && __pWindowInfo->isAppcontrolTriggered == true)
+               {
+                       LoadUrl(__pWindowInfo->pageUrl);
+               }
                else if (__pWindowInfo->isJavascriptInitiated == true)
                {
                        AppLog("Called");
@@ -5662,7 +5666,7 @@ MainForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
 {
        AppLog("MainForm::OnFormMenuRequested called");
        InitOptionMenu();
-       if (__pWindowInfo != NULL && __pWindowInfo->pageUrl != NULL && __pWebViewer->GetShowState() == true)
+       if (__pWindowInfo != NULL && __pWindowInfo->pageUrl != NULL && __pWebViewer && __pWebViewer->GetShowState() == true)
        {
                int bookmarkCount=0;
                bool exist = false;