diff --git a/Telegram/SourceFiles/core/crash_report_window.cpp b/Telegram/SourceFiles/core/crash_report_window.cpp index 3c32fb0381..e9f9563856 100644 --- a/Telegram/SourceFiles/core/crash_report_window.cpp +++ b/Telegram/SourceFiles/core/crash_report_window.cpp @@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/zlib_help.h" #include +#include #include #include #include @@ -43,7 +44,7 @@ PreLaunchWindow::PreLaunchWindow(QString title) { p.setColor(QPalette::Window, QColor(255, 255, 255)); setPalette(p); - _size = QFontMetrics(font()).height(); + _size = QFontInfo(font()).pixelSize(); int paddingVertical = (_size / 2); int paddingHorizontal = _size; diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 234ee047f1..51a71d9c9d 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -404,7 +404,7 @@ if customRunCommand: stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout 3e11c652e1 + git checkout 73fe30738d """) stage('msys64', """