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

Fix crash in RevokePublicLinkBox.

This commit is contained in:
John Preston 2018-12-25 12:48:12 +04:00
parent 22b47925d4
commit a65afdac95
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Telegram/SourceFiles/boxes/add_contact_box.cpp
View File

@ -1359,7 +1359,8 @@ RevokePublicLinkBox::Inner::Inner(QWidget *parent, Fn<void()> revokeCallback) :
resize(width(), 5 * _rowHeight); resize(width(), 5 * _rowHeight);
request(MTPchannels_GetAdminedPublicChannels()).done([this](const MTPmessages_Chats &result) { request(MTPchannels_GetAdminedPublicChannels(
)).done([=](const MTPmessages_Chats &result) {
if (auto chats = Api::getChatsFromMessagesChats(result)) { if (auto chats = Api::getChatsFromMessagesChats(result)) {
for_const (auto &chat, chats->v) { for_const (auto &chat, chats->v) {
if (auto peer = App::feedChat(chat)) { if (auto peer = App::feedChat(chat)) {
@ -1387,23 +1388,30 @@ RevokePublicLinkBox::Inner::Inner(QWidget *parent, Fn<void()> revokeCallback) :
}).send(); }).send();
} }
RevokePublicLinkBox::RevokePublicLinkBox(QWidget*, Fn<void()> revokeCallback) RevokePublicLinkBox::RevokePublicLinkBox(
: _aboutRevoke(this, lang(lng_channels_too_much_public_about), Ui::FlatLabel::InitType::Simple, st::aboutRevokePublicLabel) QWidget*,
Fn<void()> revokeCallback)
: _aboutRevoke(
this,
lang(lng_channels_too_much_public_about),
Ui::FlatLabel::InitType::Simple,
st::aboutRevokePublicLabel)
, _revokeCallback(std::move(revokeCallback)) { , _revokeCallback(std::move(revokeCallback)) {
} }
void RevokePublicLinkBox::prepare() { void RevokePublicLinkBox::prepare() {
_innerTop = st::boxPadding.top() + _aboutRevoke->height() + st::boxPadding.top(); _innerTop = st::boxPadding.top() + _aboutRevoke->height() + st::boxPadding.top();
_inner = setInnerWidget(object_ptr<Inner>(this, [this] { _inner = setInnerWidget(object_ptr<Inner>(this, [=] {
const auto callback = _revokeCallback;
closeBox(); closeBox();
if (_revokeCallback) { if (callback) {
_revokeCallback(); callback();
} }
}), st::boxLayerScroll, _innerTop); }), st::boxLayerScroll, _innerTop);
addButton(langFactory(lng_cancel), [this] { closeBox(); }); addButton(langFactory(lng_cancel), [=] { closeBox(); });
subscribe(Auth().downloaderTaskFinished(), [this] { update(); }); subscribe(Auth().downloaderTaskFinished(), [=] { update(); });
_inner->resizeToWidth(st::boxWideWidth); _inner->resizeToWidth(st::boxWideWidth);
setDimensions(st::boxWideWidth, _innerTop + _inner->height()); setDimensions(st::boxWideWidth, _innerTop + _inner->height());
@ -1448,12 +1456,16 @@ void RevokePublicLinkBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
auto confirmText = lang(lng_channels_too_much_public_revoke); auto confirmText = lang(lng_channels_too_much_public_revoke);
_weakRevokeConfirmBox = Ui::show(Box<ConfirmBox>(text, confirmText, crl::guard(this, [this, pressed]() { _weakRevokeConfirmBox = Ui::show(Box<ConfirmBox>(text, confirmText, crl::guard(this, [this, pressed]() {
if (_revokeRequestId) return; if (_revokeRequestId) return;
_revokeRequestId = request(MTPchannels_UpdateUsername(pressed->asChannel()->inputChannel, MTP_string(""))).done([this](const MTPBool &result) { _revokeRequestId = request(MTPchannels_UpdateUsername(
pressed->asChannel()->inputChannel,
MTP_string("")
)).done([=](const MTPBool &result) {
const auto callback = _revokeCallback;
if (_weakRevokeConfirmBox) { if (_weakRevokeConfirmBox) {
_weakRevokeConfirmBox->closeBox(); _weakRevokeConfirmBox->closeBox();
} }
if (_revokeCallback) { if (callback) {
_revokeCallback(); callback();
} }
}).send(); }).send();
})), LayerOption::KeepOther); })), LayerOption::KeepOther);