From 1d655fb5b5682717c20b3908ffa95de95b8c3e07 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 31 Oct 2021 10:07:12 +0400 Subject: [PATCH] Fix build on Windows and Linux CI. --- Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp | 2 -- Telegram/build/prepare/prepare.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp index f048c5765f..93c0bcb8cb 100644 --- a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp @@ -316,8 +316,6 @@ bool ProcessCurrent( const auto oldUserpicPhotoId = state->waitingFull ? state->userpicPhotoId : std::exchange(state->userpicPhotoId, userpicPhotoId); - const auto changedUserpicPhotoId - = (state->userpicPhotoId != oldUserpicPhotoId); const auto changedUserpic = (state->userpicKey != peer->userpicUniqueKey(state->userpicView)); diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 84214179e3..a06d3e2979 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -387,7 +387,7 @@ def runStages(): stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout bc18293b1c + git checkout 0ddad09b1e """) stage('depot_tools', """