fanhuadesenlinnn/tdesktop
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/telegramdesktop/tdesktop synced 2026-09-20 08:03:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rebind Info wrap teardown when a sublist is replaced

Browse Source 
Task: 2026/08/21/resubscribe-info-wrap-teardown-on-replaced-sublist
This commit is contained in:
John Preston
2026-08-21 12:31:27 +04:00
committed by 23rd
parent ddbc3cef68
commit c2c058517c
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,7 +146,11 @@ WrapWidget::WrapWidget(
});
}, lifetime());
restoreHistoryStack(memento->takeStack());
subscribeToThreadDestroyed();
}
void WrapWidget::subscribeToThreadDestroyed() {
_threadDestroyedLifetime.destroy();
if (const auto topic = _controller->topic()) {
topic->destroyed(
) | rpl::on_next([=] {
@@ -160,9 +164,8 @@ WrapWidget::WrapWidget(
} else {
_removeRequests.fire({});
}
}, lifetime());
}
if (const auto sublist = _controller->sublist()) {
}, _threadDestroyedLifetime);
} else if (const auto sublist = _controller->sublist()) {
sublist->destroyed(
) | rpl::on_next([=] {
const auto parent = _controller->parentController();
@@ -175,7 +178,7 @@ WrapWidget::WrapWidget(
Window::SectionShow::Way::ClearStack,
anim::type::instant));
_removeRequests.fire({});
}, lifetime());
}, _threadDestroyedLifetime);
}
}
@@ -1040,6 +1043,7 @@ void WrapWidget::showNewContent(
showNewContent(memento);
}
}
subscribeToThreadDestroyed();
if (animationParams) {
if (Ui::InFocusChain(this)) {

2
Telegram/SourceFiles/info/info_wrap_widget.h
View File

@@ -188,6 +188,7 @@ private:
void showNewContent(
not_null<ContentMemento*> memento,
const Window::SectionShow &params);
void subscribeToThreadDestroyed();
bool returnToFirstStackFrame(
not_null<ContentMemento*> memento,
const Window::SectionShow &params);
@@ -246,6 +247,7 @@ private:
std::vector<StackItem> _historyStack;
rpl::event_stream<> _removeRequests;
rpl::lifetime _threadDestroyedLifetime;
bool _shortcutsSetup = false;
rpl::event_stream<rpl::producer<int>> _desiredHeights;

1
tasks/2026/08/21/resubscribe-info-wrap-teardown-on-replaced-sublist.md Normal file
View File

@@ -0,0 +1 @@
Info wrap `destroyed()` teardown now rebinds when `showNewContent` replaces the controller, using a wrap-owned lifetime so an old sublist cannot tear down a wrap that no longer shows it. The constructor path still subscribes.