mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-04 00:25:17 +00:00
Code Issues Releases Wiki Activity

Fix crash in SelfDestructionBox.

Browse Source 
base::lambda_guarded may destroy the lambda after the owner. In case
of SelfDestructionBox it lead to a dtor of a dangling object_ptr.

MTP::Sender destroys the lambda handlers together with itself.
This commit is contained in:
John Preston
2017-03-23 15:15:21 +03:00
parent e9ec09b91a
commit e38d683979
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/boxes/self_destruction_box.cpp
View File

@@ -44,7 +44,7 @@ void SelfDestructionBox::prepare() {
addButton(lang(lng_cancel), [this] { closeBox(); }); addButton(lang(lng_cancel), [this] { closeBox(); });
MTP::send(MTPaccount_GetAccountTTL(), rpcDone(base::lambda_guarded(this, [this, loading = std::move(loading)](const MTPAccountDaysTTL &result) mutable { request(MTPaccount_GetAccountTTL()).done([this, loading = std::move(loading)](const MTPAccountDaysTTL &result) mutable {
Expects(result.type() == mtpc_accountDaysTTL); Expects(result.type() == mtpc_accountDaysTTL);
Expects(!_ttlValues.empty()); Expects(!_ttlValues.empty());
@@ -77,5 +77,5 @@ void SelfDestructionBox::prepare() {
closeBox(); closeBox();
}); });
addButton(lang(lng_cancel), [this] { closeBox(); }); addButton(lang(lng_cancel), [this] { closeBox(); });
}))); }).send();
} }

3
Telegram/SourceFiles/boxes/self_destruction_box.h
View File

@@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#pragma once #pragma once
#include "boxes/abstractbox.h" #include "boxes/abstractbox.h"
#include "mtproto/sender.h"
namespace Ui { namespace Ui {
class RadiobuttonGroup; class RadiobuttonGroup;
@@ -28,7 +29,7 @@ class Radiobutton;
class FlatLabel; class FlatLabel;
} // namespace Ui } // namespace Ui
class SelfDestructionBox : public BoxContent { class SelfDestructionBox : public BoxContent, private MTP::Sender {
Q_OBJECT Q_OBJECT
public: public: