Author: stippi Date: Wed May 19 20:07:20 2010 New Revision: 503 URL: http://mmlr.dyndns.org/changeset/503 Log: Fix empty URL input bar when switching to a tab after it loaded in the background. Modified: webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp Modified: webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp ============================================================================== --- webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp Tue May 18 19:13:58 2010 (r502) +++ webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp Wed May 19 20:07:20 2010 (r503) @@ -188,9 +188,9 @@ fURLInputContents = text; } - const char* URLInputContents() const + const BString& URLInputContents() const { - return fURLInputContents.String(); + return fURLInputContents; } void SetURLInputSelection(int32 selectionStart, int32 selectionEnd) @@ -946,7 +946,10 @@ if (userData != NULL) { fURLInputGroup->SetPageIcon(userData->PageIcon()); - fURLInputGroup->SetText(userData->URLInputContents()); + if (userData->URLInputContents().Length()) + fURLInputGroup->SetText(userData->URLInputContents()); + else + fURLInputGroup->SetText(webView->MainFrameURL()); if (userData->URLInputSelectionStart() >= 0) { fURLInputGroup->TextView()->Select( userData->URLInputSelectionStart(),