Better fix for a crash on quit.

This commit is contained in:
John Preston 2018-11-10 12:06:44 +04:00
parent 4532e59933
commit 48889ce56e
3 changed files with 5 additions and 9 deletions

View file

@ -265,7 +265,9 @@ void LayerWidget::closeHook() {
} }
LayerWidget::~LayerWidget() { LayerWidget::~LayerWidget() {
restoreFloatPlayerDelegate(); if (!App::quitting()) {
restoreFloatPlayerDelegate();
}
} }
} // namespace Info } // namespace Info

View file

@ -904,7 +904,6 @@ void MainWindow::updateIsActiveHook() {
} }
MainWindow::~MainWindow() { MainWindow::~MainWindow() {
ui_hideSettingsAndLayer(anim::type::instant);
if (_clearManager) { if (_clearManager) {
_clearManager->stop(); _clearManager->stop();
_clearManager = nullptr; _clearManager = nullptr;

View file

@ -400,16 +400,11 @@ void LayerStackWidget::hideLayers(anim::type animated) {
} }
void LayerStackWidget::hideAll(anim::type animated) { void LayerStackWidget::hideAll(anim::type animated) {
const auto clear = [=] { startAnimation([] {}, [=] {
clearLayers(); clearLayers();
clearSpecialLayer(); clearSpecialLayer();
_mainMenu.destroyDelayed(); _mainMenu.destroyDelayed();
}; }, Action::HideAll, animated);
if (App::quitting()) {
clear();
} else {
startAnimation([] {}, clear, Action::HideAll, animated);
}
} }
void LayerStackWidget::hideTopLayer(anim::type animated) { void LayerStackWidget::hideTopLayer(anim::type animated) {