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

Fix crash when switching two columns at once.

This commit is contained in:
John Preston 2017-11-13 10:00:38 +04:00
parent 8355722f4e
commit 534b578598
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/info/info_wrap_widget.cpp
View File

@ -586,7 +586,7 @@ bool WrapWidget::showInternal(
not_null<Window::SectionMemento*> memento, not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) { const Window::SectionShow &params) {
if (auto infoMemento = dynamic_cast<Memento*>(memento.get())) { if (auto infoMemento = dynamic_cast<Memento*>(memento.get())) {
if (infoMemento->stackSize() > 1) { if (!_controller || infoMemento->stackSize() > 1) {
return false; return false;
} }
auto content = infoMemento->content(); auto content = infoMemento->content();
@ -606,10 +606,14 @@ bool WrapWidget::showInternal(
std::unique_ptr<Window::SectionMemento> WrapWidget::createMemento() { std::unique_ptr<Window::SectionMemento> WrapWidget::createMemento() {
auto stack = std::vector<std::unique_ptr<ContentMemento>>(); auto stack = std::vector<std::unique_ptr<ContentMemento>>();
stack.reserve(_historyStack.size() + 1); stack.reserve(_historyStack.size() + 1);
for (auto &stackItem : _historyStack) { for (auto &stackItem : base::take(_historyStack)) {
stack.push_back(std::move(stackItem.section)); stack.push_back(std::move(stackItem.section));
} }
stack.push_back(_content->createMemento()); stack.push_back(_content->createMemento());
// We're not in valid state anymore and supposed to be destroyed.
_controller = nullptr;
return std::make_unique<Memento>(std::move(stack)); return std::make_unique<Memento>(std::move(stack));
} }

1
Telegram/SourceFiles/mainwidget.cpp
View File

@ -3613,6 +3613,7 @@ void MainWidget::updateThirdColumnToCurrentPeer(
if (!_stack.empty() && _thirdSection) { if (!_stack.empty() && _thirdSection) {
_stack.back()->setThirdSectionMemento( _stack.back()->setThirdSectionMemento(
_thirdSection->createMemento()); _thirdSection->createMemento());
_thirdSection.destroy();
} }
}; };
auto params = Window::SectionShow( auto params = Window::SectionShow(