mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-01 06:55:58 +00:00
Code Issues Releases Wiki Activity

Fix crash in session destruction.

Browse Source 
Also use rpl::event_stream for downloaderTaskFinished.
This commit is contained in:
John Preston
2020-07-01 12:03:34 +04:00
parent 0981335ca7
commit eb1845e33b
38 changed files with 129 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Telegram/SourceFiles/window/notifications_manager_default.cpp
View File

@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/themes/window_theme.h"
#include "storage/file_download.h"
#include "main/main_session.h"
#include "main/main_account.h"
#include "history/history.h"
#include "history/history_item.h"
#include "platform/platform_specific.h"
@@ -229,14 +230,16 @@ void Manager::showNextFromQueue() {
void Manager::subscribeToSession(not_null<Main::Session*> session) {
auto i = _subscriptions.find(session);
if (i == _subscriptions.end()) {
i = _subscriptions.emplace(session, base::Subscription()).first;
session->lifetime().add([=] {
i = _subscriptions.emplace(session).first;
session->account().sessionChanges(
) | rpl::start_with_next([=] {
_subscriptions.remove(session);
});
} else if (i->second) {
}, i->second.lifetime);
} else if (i->second.subscription) {
return;
}
i->second = session->downloaderTaskFinished().add_subscription([=] {
session->downloaderTaskFinished(
) | rpl::start_with_next([=] {
auto found = false;
for (const auto &notification : _notifications) {
if (const auto history = notification->maybeHistory()) {
@@ -247,9 +250,9 @@ void Manager::subscribeToSession(not_null<Main::Session*> session) {
}
}
if (!found) {
_subscriptions[session].destroy();
_subscriptions[session].subscription.destroy();
}
});
}, i->second.subscription);
}
void Manager::moveWidgets() {