procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Fix possible crash in notifications setup.

Browse source 
Initial _account assignment triggered sync createManager(),
which in case of native Windows notifications called
ToastNotificationManager::CreateToastNotifier, which could enter
qt-wndproc-message processing with QEvent::ApplicationActivated
delivery and calling updateNonIdle() which called
Window::Controller::account(), that wasn't yet set.
This commit is contained in:
John Preston 2024-04-02 11:26:22 +04:00
parent e02b60d8fa
commit 615ad85d26
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/main/main_domain.cpp
View file

@ -32,11 +32,13 @@ Domain::Domain(const QString &dataName)
: _dataName(dataName)
, _local(std::make_unique<Storage::Domain>(this, dataName)) {
_active.changes(
) | rpl::take(1) | rpl::start_with_next([] {
) | rpl::take(1) | rpl::start_with_next([=] {
// In case we had a legacy passcoded app we start settings here.
Core::App().startSettingsAndBackground();
Core::App().notifications().createManager();
crl::on_main(this, [=] {
Core::App().notifications().createManager();
});
}, _lifetime);
_active.changes(

3
Telegram/SourceFiles/main/main_domain.h
View file

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "base/timer.h"
#include "base/weak_ptr.h"
namespace Storage {
class Domain;
@ -23,7 +24,7 @@ namespace Main {
class Account;
class Session;
class Domain final {
class Domain final : public base::has_weak_ptr {
public:
struct AccountWithIndex {
int index = 0;