Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26:34 +01:00
Code Releases Activity

Don't use double QUrl::fromUserInput in QupZilla constructor.

Browse Source 
Closes #762
This commit is contained in:
nowrep 2013-02-19 11:56:47 +01:00
parent ac7dc197ae
commit 18a1d4802e
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -21,6 +21,7 @@ Version 1.4.0
* don't steal Ctrl+B/U/I shortcuts from page * don't steal Ctrl+B/U/I shortcuts from page
* disabled by default opacity effect on tab previews - see BUILDING * disabled by default opacity effect on tab previews - see BUILDING
* improved showing navigation toolbar in fullscreen * improved showing navigation toolbar in fullscreen
* fixed opening browser with url with ampersand (%26) as command line argument
* fixed scrolling to anchor in background tabs * fixed scrolling to anchor in background tabs
* fixed parsing UTF-8 filenames in Content-Disposition header * fixed parsing UTF-8 filenames in Content-Disposition header
* fixed crash with context menu in websearchbar and locationbar * fixed crash with context menu in websearchbar and locationbar

11
src/lib/app/mainapplication.cpp
View File

@ -564,12 +564,12 @@ void MainApplication::receiveAppMessage(QString message)
QUrl actUrl; QUrl actUrl;
if (message.startsWith(QLatin1String("URL:"))) { if (message.startsWith(QLatin1String("URL:"))) {
QUrl url = QUrl::fromUserInput(message.mid(4)); const QUrl &url = QUrl::fromUserInput(message.mid(4));
addNewTab(url); addNewTab(url);
actWin = getWindow(); actWin = getWindow();
} }
else if (message.startsWith(QLatin1String("ACTION:"))) { else if (message.startsWith(QLatin1String("ACTION:"))) {
QString text = message.mid(7); const QString &text = message.mid(7);
if (text == QLatin1String("NewTab")) { if (text == QLatin1String("NewTab")) {
addNewTab(); addNewTab();
} }
@ -589,8 +589,11 @@ void MainApplication::receiveAppMessage(QString message)
} }
} }
if (!actWin && !isClosing()) { // It can only occur if download manager window was still open if (!actWin) {
makeNewWindow(Qz::BW_NewWindow, actUrl); if (!isClosing()) {
// It can only occur if download manager window was still opened
makeNewWindow(Qz::BW_NewWindow, actUrl);
}
return; return;
} }

2
src/lib/app/qupzilla.cpp
View File

@ -204,7 +204,7 @@ void QupZilla::postLaunch()
show(); show();
if (!m_startingUrl.isEmpty()) { if (!m_startingUrl.isEmpty()) {
startUrl = QUrl::fromUserInput(m_startingUrl.toString()); startUrl = m_startingUrl;
addTab = true; addTab = true;
} }