Set exit before quit is called
This commit is contained in:
parent
ae2ca175d3
commit
83ad7d4935
|
@ -1171,8 +1171,8 @@ void MainWindow::Exit() {
|
||||||
settings_dialog_.reset();
|
settings_dialog_.reset();
|
||||||
|
|
||||||
if (exit_count_ > 1) {
|
if (exit_count_ > 1) {
|
||||||
qApp->quit();
|
|
||||||
exit_ = true;
|
exit_ = true;
|
||||||
|
qApp->quit();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (app_->player()->engine()->is_fadeout_enabled()) {
|
if (app_->player()->engine()->is_fadeout_enabled()) {
|
||||||
|
@ -1194,12 +1194,12 @@ void MainWindow::DoExit() {
|
||||||
|
|
||||||
QObject::connect(app_, &Application::ExitFinished, this, &MainWindow::ExitFinished);
|
QObject::connect(app_, &Application::ExitFinished, this, &MainWindow::ExitFinished);
|
||||||
app_->Exit();
|
app_->Exit();
|
||||||
exit_ = true;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::ExitFinished() {
|
void MainWindow::ExitFinished() {
|
||||||
|
|
||||||
|
exit_ = true;
|
||||||
qApp->quit();
|
qApp->quit();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue