[haiku-webkit-commits] r398 - webkit/trunk/WebKit/haiku/WebPositive
- From: webkit@xxxxxxxxxxxxxxx
- To: haiku-webkit-commits@xxxxxxxxxxxxx
- Date: Wed, 07 Apr 2010 12:46:39 +0000
Author: stippi
Date: Wed Apr 7 12:46:39 2010
New Revision: 398
URL: http://mmlr.dyndns.org/changeset/398
Log:
In BrowserWindow::_TabChanged(), the BWebView could be NULL. Also check if there
is a focused view set at all.
Modified:
webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp
Modified: webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp
==============================================================================
--- webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp Wed Apr 7
10:55:29 2010 (r397)
+++ webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp Wed Apr 7
12:46:39 2010 (r398)
@@ -1228,17 +1228,19 @@
SetCurrentWebView(webView);
- PageUserData* userData =
static_cast<PageUserData*>(webView->GetUserData());
- if (userData)
- userData->FocusedView()->MakeFocus(true);
- else
- webView->MakeFocus(true);
-
if (webView)
_UpdateTitle(webView->MainFrameTitle());
else
_UpdateTitle("");
+
if (webView) {
+ PageUserData* userData = static_cast<PageUserData*>(
+ webView->GetUserData());
+ if (userData && userData->FocusedView() != NULL)
+ userData->FocusedView()->MakeFocus(true);
+ else
+ webView->MakeFocus(true);
+
fURLTextControl->SetText(webView->MainFrameURL());
// Trigger update of the interface to the new page, by
requesting
// to resend all notifications.
Other related posts:
- » [haiku-webkit-commits] r398 - webkit/trunk/WebKit/haiku/WebPositive - webkit
