Prevent issues

Change-Id: Ie56de90a66241a1e831802ce7226cc393508e8b5

diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index 6122fbf..51618f2 100644 (file)
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -548,15 +548,11 @@ HistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                for (int i = 0; i < __pBookmarkList->GetCount();i++)
                {
                        BookmarkData* pBookMark = dynamic_cast< BookmarkData* >(__pBookmarkList->GetAt(i));
-                       if(pHistory->GetHistoryUrl().CompareTo(pBookMark->GetUrl()) == 0)
+                       if(pBookMark != null && pHistory->GetHistoryUrl().CompareTo(pBookMark->GetUrl()) == 0)
                        {
                                urlFoundInBookmark = true;
                                break;
                        }
-                       else
-                       {
-                               pBookmarkBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ICON_BOOKMARK_OFF_TEMP);
-                       }
                }
        }
        if (urlFoundInBookmark == true)
@@ -862,7 +858,7 @@ HistoryListForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, in
                        for (int i = 0; i < __pBookmarkList->GetCount(); i++)
                        {
                                pBookMark = dynamic_cast< BookmarkData* >(__pBookmarkList->GetAt(i));
-                               if (toggledUrl.CompareTo(pBookMark->GetUrl()) == 0)
+                               if (pBookMark != null && toggledUrl.CompareTo(pBookMark->GetUrl()) == 0)
                                {
                                        bookmarkFound = true;
                                        break;

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 5b6d44e..61db480 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -3814,8 +3814,7 @@ MainForm::OnTouchReleased(Tizen::Ui::Control& source, const Tizen::Ui::TouchEven
                __pFindWordCountLabel->SetText(L"0/0");
                __pWebViewer->SearchText(L"aaaabbbbcccc",true);
                __pFindWordControl->SetShowState(false);
-               if (__pFindWordEditField)
-                       __pFindWordEditField->HideKeypad();
+               __pFindWordEditField->HideKeypad();
        }
        if(__pAddressbar->GetShowState() == false)
        {