Fix, trying to open a xul file that doesn't create an hidden windows

master
Dorian 7 years ago
parent cca7a14274
commit 998aa6a676
  1. 6
      k-meleon/BrowserViewUtils.cpp
  2. 1
      k-meleon/BrowserWindow.cpp

@ -316,7 +316,7 @@ void CBrowserView::OpenURL(const char* pUrl, nsIURI *refURI, BOOL allowFixup)
void CBrowserView::OpenURL(LPCTSTR url, LPCTSTR referrer, BOOL allowFixup)
{
if (!url) return;
if (!url || !url[0]) return;
//mpBrowserFrame->UpdateLocation(url, TRUE);
/* // Basically, trying to open an url in a dialog, so we open it elsewhere
@ -343,8 +343,8 @@ void CBrowserView::OpenURL(LPCTSTR url, LPCTSTR referrer, BOOL allowFixup)
m_pWindow->SetActive(TRUE);*/
((CBrowserGlue*)m_pBrowserGlue)->mPendingLocation = url; // XXXX
if (!m_pWindow->LoadURL(url, referrer, allowFixup) && m_pBrowserGlue);
// m_pWindow->LoadURL(_T("about:blank"));
if (!m_pWindow->LoadURL(url, referrer, allowFixup) && m_pBrowserGlue)
m_pWindow->LoadURL(_T("about:blank"));
}
/*
void CBrowserView::OpenURL(LPCTSTR url, BOOL sendRef, BOOL allowFixup)

@ -393,6 +393,7 @@ BOOL CBrowserWrapper::LoadURL(LPCTSTR url, LPCTSTR referrer, BOOL allowFixup)
ASSERT(mWebNav);
NS_ENSURE_TRUE(url, FALSE);
NS_ENSURE_TRUE(mWebNav, FALSE);
if (!*url) return FALSE;
nsCOMPtr<nsIURI> referrerURI;
if (referrer)

Loading…
Cancel
Save