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:
@@ -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();
|
||||
}
|
||||
|
Reference in New Issue
Block a user