void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-15 21:57:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add some checks for actions in a locked state.

Browse source
This commit is contained in:
John Preston 2021-12-06 12:31:08 +04:00
parent 6db537d1ec
commit 01c2be3f01
3 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
View file

@ -42,6 +42,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "main/main_session.h"
#include "main/main_session_settings.h"
#include "window/notifications_manager.h"
#include "window/window_controller.h"
#include "window/window_session_controller.h"
#include "window/window_peer_menu.h"
#include "ui/widgets/multi_select.h"
@ -3011,7 +3012,9 @@ void InnerWidget::updateRowCornerStatusShown(
void InnerWidget::setupShortcuts() {
Shortcuts::Requests(
) | rpl::filter([=] {
return isActiveWindow() && !Ui::isLayerShown();
return isActiveWindow()
&& !Ui::isLayerShown()
&& !_controller->window().locked();
}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
using Command = Shortcuts::Command;

8
Telegram/SourceFiles/mainwidget.cpp
View file

@ -1257,8 +1257,9 @@ void MainWidget::ui_showPeerHistory(
PeerId peerId,
const SectionShow &params,
MsgId showAtMsgId) {
if (auto peer = session().data().peerLoaded(peerId)) {
if (peerId && _controller->window().locked()) {
return;
} else if (auto peer = session().data().peerLoaded(peerId)) {
if (peer->migrateTo()) {
peer = peer->migrateTo();
peerId = peer->id;
@ -1579,6 +1580,9 @@ void MainWidget::showNewSection(
const SectionShow &params) {
using Column = Window::Column;
if (_controller->window().locked()) {
return;
}
auto saveInStack = (params.way == SectionShow::Way::Forward);
const auto thirdSectionTop = getThirdSectionTop();
const auto newThirdGeometry = QRect(

18
Telegram/SourceFiles/platform/mac/main_window_mac.mm
View file

@ -485,17 +485,15 @@ void MainWindow::createGlobalMenu() {
QMenu *window = psMainMenu.addMenu(tr::lng_mac_menu_window(tr::now));
psContacts = window->addAction(tr::lng_mac_menu_contacts(tr::now));
connect(psContacts, &QAction::triggered, psContacts, crl::guard(this, [=] {
if (isHidden()) {
showFromTray();
}
if (!sessionController()) {
return;
}
Expects(sessionController() != nullptr && !controller().locked());
ensureWindowShown();
sessionController()->show(PrepareContactsBox(sessionController()));
}));
{
auto callback = [=] {
Expects(sessionController() != nullptr);
Expects(sessionController() != nullptr && !controller().locked());
ensureWindowShown();
sessionController()->showAddContact();
};
@ -507,7 +505,8 @@ void MainWindow::createGlobalMenu() {
window->addSeparator();
{
auto callback = [=] {
Expects(sessionController() != nullptr);
Expects(sessionController() != nullptr && !controller().locked());
ensureWindowShown();
sessionController()->showNewGroup();
};
@ -518,7 +517,8 @@ void MainWindow::createGlobalMenu() {
}
{
auto callback = [=] {
Expects(sessionController() != nullptr);
Expects(sessionController() != nullptr && !controller().locked());
ensureWindowShown();
sessionController()->showNewChannel();
};