Temporarily enable JavaScript when loading qupzilla:restore page

remotes/origin/Falkon/3.0
David Rosca 8 years ago
parent 736e3121bc
commit 53f6ef91ac
  1. 3
      src/lib/app/browserwindow.cpp
  2. 4
      src/lib/app/mainapplication.cpp

@ -178,6 +178,9 @@ void BrowserWindow::postLaunch()
if (mApp->isStartingAfterCrash()) {
addTab = false;
startUrl.clear();
// qupzilla:restore needs JavaScript enabled
// correct value is then restored in MainApplication::destroyRestoreManager
QWebEngineSettings::defaultSettings()->setAttribute(QWebEngineSettings::JavascriptEnabled, true);
m_tabWidget->addView(QUrl("falkon:restore"), Qz::NT_CleanSelectedTabAtTheEnd);
}
else if ((mApp->afterLaunch() == MainApplication::SelectSession || mApp->afterLaunch() == MainApplication::RestoreSession) && mApp->restoreManager()) {

@ -472,6 +472,10 @@ bool MainApplication::restoreSession(BrowserWindow* window, RestoreData restoreD
void MainApplication::destroyRestoreManager()
{
// Restore JavaScript settings
const bool jsEnabled = Settings().value(QSL("Web-Browser-Settings/allowJavaScript"), true).toBool();
QWebEngineSettings::defaultSettings()->setAttribute(QWebEngineSettings::JavascriptEnabled, jsEnabled);
delete m_restoreManager;
m_restoreManager = 0;
}

Loading…
Cancel
Save