From 88e80b4fae0f4616d49a33593d01d5e8f8ddc002 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 22 Jan 2025 23:56:52 +0400
Subject: [PATCH] Version 5.10.4: Fix build with GCC.
---
.../history/view/media/history_view_premium_gift.cpp | 1 -
.../history/view/media/history_view_unique_gift.cpp | 1 -
.../SourceFiles/media/audio/media_audio_local_cache.cpp | 6 +++++-
.../platform/linux/notifications_manager_linux.cpp | 5 +++--
Telegram/lib_ui | 2 +-
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
index 0144f4691..cd8da2ce3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
@@ -224,7 +224,6 @@ ClickHandlerPtr PremiumGift::createViewLink() {
return link;
}
const auto from = _gift->from();
- const auto itemId = _parent->data()->fullId();
const auto peer = _parent->history()->peer;
const auto date = _parent->data()->date();
const auto data = *_gift->gift();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_unique_gift.cpp b/Telegram/SourceFiles/history/view/media/history_view_unique_gift.cpp
index 8bd65cfd4..744b3bd08 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_unique_gift.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_unique_gift.cpp
@@ -457,7 +457,6 @@ auto GenerateUniqueGiftMedia(
st::chatUniqueTextPadding,
gift->backdrop.textColor));
- const auto itemId = parent->data()->fullId();
auto link = OpenStarGiftLink(parent->data());
push(std::make_unique<ButtonPart>(
tr::lng_sticker_premium_view(tr::now),
diff --git a/Telegram/SourceFiles/media/audio/media_audio_local_cache.cpp b/Telegram/SourceFiles/media/audio/media_audio_local_cache.cpp
index 6fa45d2e3..dd1fa6de1 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_local_cache.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_local_cache.cpp
@@ -20,6 +20,10 @@ constexpr auto kFrameSize = 4096;
[[nodiscard]] QByteArray ConvertAndCut(const QByteArray &bytes) {
using namespace FFmpeg;
+ if (bytes.isEmpty()) {
+ return {};
+ }
+
auto wrap = ReadBytesWrap{
.size = bytes.size(),
.data = reinterpret_cast<const uchar*>(bytes.constData()),
@@ -322,7 +326,7 @@ LocalSound LocalCache::sound(
if (!result.isEmpty()) {
return { id, result };
}
- result = resolveOriginalBytes();
+ result = ConvertAndCut(resolveOriginalBytes());
return !result.isEmpty()
? LocalSound{ id, result }
: fallbackOriginalBytes
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 76487bfad..0a51e5a44 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -772,6 +772,7 @@ void Manager::Private::showNotification(
NotificationInfo &&info,
Ui::PeerUserpicView &userpicView) {
const auto peer = info.peer;
+ const auto options = info.options;
const auto key = ContextId{
.sessionId = peer->session().uniqueId(),
.peerId = peer->id,
@@ -797,7 +798,7 @@ void Manager::Private::showNotification(
auto i = _notifications.find(key);
if (i != end(_notifications)) {
- auto j = i->second.find(msgId);
+ auto j = i->second.find(info.itemId);
if (j != end(i->second)) {
auto oldNotification = std::move(j->second);
i->second.erase(j);
@@ -811,7 +812,7 @@ void Manager::Private::showNotification(
base::flat_map<MsgId, Notification>()).first;
}
const auto j = i->second.emplace(
- msgId,
+ info.itemId,
std::move(notification)).first;
j->second->show();
}
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 5fbb38cf8..e6e1cb743 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 5fbb38cf872f2132b1ad0a564083c498e6cc6f14
+Subproject commit e6e1cb7436262dba90e4764615e998f19d662443