mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-07-25 15:04:57 +00:00
Merge tag 'v4.14.6' into dev
# Conflicts: # Telegram/Resources/winrc/Telegram.rc # Telegram/Resources/winrc/Updater.rc # Telegram/SourceFiles/core/version.h # Telegram/SourceFiles/dialogs/dialogs_widget.cpp # Telegram/SourceFiles/dialogs/dialogs_widget.h # Telegram/SourceFiles/history/history_item_helpers.cpp # Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp # Telegram/lib_ui # lib/xdg/org.telegram.desktop.metainfo.xml # snap/snapcraft.yaml
This commit is contained in:
@@ -1109,7 +1109,7 @@ void Session::watchForOffline(not_null<UserData*> user, TimeId now) {
|
||||
return;
|
||||
}
|
||||
const auto till = user->onlineTill;
|
||||
const auto [i, ok] = _watchingForOffline.emplace(user, till);
|
||||
const auto &[i, ok] = _watchingForOffline.emplace(user, till);
|
||||
if (!ok) {
|
||||
if (i->second == till) {
|
||||
return;
|
||||
@@ -1638,7 +1638,7 @@ HistoryItem *Session::changeMessageId(PeerId peerId, MsgId wasId, MsgId nowId) {
|
||||
}
|
||||
const auto item = i->second;
|
||||
list->erase(i);
|
||||
const auto [j, ok] = list->emplace(nowId, item);
|
||||
const auto &[j, ok] = list->emplace(nowId, item);
|
||||
|
||||
if (!peerIsChannel(peerId)) {
|
||||
if (IsServerMsgId(wasId)) {
|
||||
@@ -1801,7 +1801,7 @@ void Session::registerHighlightProcess(
|
||||
not_null<HistoryItem*> item) {
|
||||
Expects(item->inHighlightProcess());
|
||||
|
||||
const auto [i, ok] = _highlightings.emplace(processId, item);
|
||||
const auto &[i, ok] = _highlightings.emplace(processId, item);
|
||||
|
||||
Ensures(ok);
|
||||
}
|
||||
@@ -4272,7 +4272,7 @@ not_null<Folder*> Session::folder(FolderId id) {
|
||||
if (const auto result = folderLoaded(id)) {
|
||||
return result;
|
||||
}
|
||||
const auto [it, ok] = _folders.emplace(
|
||||
const auto &[it, ok] = _folders.emplace(
|
||||
id,
|
||||
std::make_unique<Folder>(this, id));
|
||||
return it->second.get();
|
||||
|
||||
Reference in New Issue
Block a user