2
0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00

Merge remote-tracking branch 'tdesktop/dev' into dev

This commit is contained in:
RadRussianRus
2019-11-06 15:13:32 +03:00
778 changed files with 5447 additions and 87456 deletions

View File

@@ -300,7 +300,7 @@ void BlockedBoxController::BlockNewUser(
};
Ui::show(
Box<PeerListBox>(std::move(controller), std::move(initBox)),
LayerOption::KeepOther);
Ui::LayerOption::KeepOther);
}
bool BlockedBoxController::appendRow(not_null<UserData*> user) {
@@ -523,7 +523,7 @@ void LastSeenPrivacyController::confirmSave(
tr::lng_continue(tr::now),
tr::lng_cancel(tr::now),
std::move(callback));
*weakBox = Ui::show(std::move(box), LayerOption::KeepOther);
*weakBox = Ui::show(std::move(box), Ui::LayerOption::KeepOther);
} else {
saveCallback();
}