diff options
author | Maciej Skrzypkowski <m.skrzypkows@samsung.com> | 2016-07-09 13:44:06 +0200 |
---|---|---|
committer | Maciej Skrzypkowski <m.skrzypkows@samsung.com> | 2016-07-09 13:46:14 +0200 |
commit | 2785fa9fe2d6be7462cd0a0a173744931fc7bb26 (patch) | |
tree | 3cc8e9d9f7a862302aa04ccb3d6f0d8b284fc12c | |
parent | 3229427bde11b930605f7c4b6dcba06ff4b76f99 (diff) | |
download | browser-2785fa9fe2d6be7462cd0a0a173744931fc7bb26.tar.gz browser-2785fa9fe2d6be7462cd0a0a173744931fc7bb26.tar.bz2 browser-2785fa9fe2d6be7462cd0a0a173744931fc7bb26.zip |
Fix for SVACE 84793
Change-Id: I6308a7a11d672df012516916afee6c85fd70c2e5
Signed-off-by: Maciej Skrzypkowski <m.skrzypkows@samsung.com>
-rw-r--r-- | services/SimpleUI/SimpleUI.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp index 1b545ba4..40b0216f 100644 --- a/services/SimpleUI/SimpleUI.cpp +++ b/services/SimpleUI/SimpleUI.cpp @@ -781,13 +781,17 @@ void SimpleUI::onOpenURL(const std::string& url) void SimpleUI::onOpenURL(const std::string& url, const std::string& title, bool desktopMode) { BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); - m_viewManager.popStackTo(m_webPageUI.get()); - if (tabsCount() == 0 || m_webPageUI->stateEquals(WPUState::QUICK_ACCESS)) - openNewTab(url, title, boost::none, desktopMode, false, basic_webengine::TabOrigin::QUICKACCESS); - else { - m_webPageUI->switchViewToWebPage(m_webEngine->getLayout(), title); - m_webEngine->setURI(url); - m_webPageUI->getURIEntry().clearFocus(); + if (m_webPageUI) { + m_viewManager.popStackTo(m_webPageUI.get()); + if (tabsCount() == 0 || m_webPageUI->stateEquals(WPUState::QUICK_ACCESS)) + openNewTab(url, title, boost::none, desktopMode, false, basic_webengine::TabOrigin::QUICKACCESS); + else { + m_webPageUI->switchViewToWebPage(m_webEngine->getLayout(), title); + m_webEngine->setURI(url); + m_webPageUI->getURIEntry().clearFocus(); + } + } else { + BROWSER_LOGW("[%s:%d] No m_webPageUI object!", __PRETTY_FUNCTION__, __LINE__); } } |