Merge branch 'release/20.08' into master

This commit is contained in:
Nate Graham 2020-10-05 15:19:04 -06:00
commit 462982faa3

View file

@ -475,7 +475,10 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
closedByUser = false;
}
if (m_tabWidget->count() > 1 && GeneralSettings::confirmClosingMultipleTabs() && closedByUser) {
if (m_tabWidget->count() > 1
&& GeneralSettings::confirmClosingMultipleTabs()
&& !GeneralSettings::rememberOpenedTabs()
&& closedByUser) {
// Ask the user if he really wants to quit and close all tabs.
// Open a confirmation dialog with 3 buttons:
// QDialogButtonBox::Yes -> Quit