procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix possible crash in layers destruction. 

clearClosingLayers could've called itself from layer->setClosing.
This commit is contained in:
John Preston 2019-03-20 11:39:41 +04:00
parent 2ebbf062d0
commit 6ff8c1de05
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/window/layer_widget.cpp
View File

@ -801,13 +801,15 @@ void LayerStackWidget::clearClosingLayers() {
// This may destroy LayerStackWidget (by calling Ui::hideLayer). // This may destroy LayerStackWidget (by calling Ui::hideLayer).
// So each time we check a weak pointer (if we are still alive). // So each time we check a weak pointer (if we are still alive).
layer->setClosing(); layer->setClosing();
if (weak) {
// setClosing() could destroy 'this' or could call clearLayers().
if (weak && !_closingLayers.empty()) {
// We could enqueue more closing layers, so we remove by index. // We could enqueue more closing layers, so we remove by index.
Assert(index < _closingLayers.size()); Assert(index < _closingLayers.size());
Assert(_closingLayers[index].get() == layer); Assert(_closingLayers[index].get() == layer);
_closingLayers.erase(begin(_closingLayers) + index); _closingLayers.erase(begin(_closingLayers) + index);
} else { } else {
// All layers were already destroyed in ~LayerStackWidget. // Everything was destroyed in clearLayers or ~LayerStackWidget.
break; break;
} }
} }