From bae9af1076e25517ff657efbbf3aad9839c0f29f Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 23 Apr 2024 09:39:28 +0400 Subject: [PATCH] Switch crash reporter to system fonts This should prevent nested crashes when loading custom fonts --- Telegram/SourceFiles/core/crash_report_window.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Telegram/SourceFiles/core/crash_report_window.cpp b/Telegram/SourceFiles/core/crash_report_window.cpp index 3c19013c9..b73c12aed 100644 --- a/Telegram/SourceFiles/core/crash_report_window.cpp +++ b/Telegram/SourceFiles/core/crash_report_window.cpp @@ -32,8 +32,6 @@ constexpr auto kDefaultProxyPort = 80; PreLaunchWindow *PreLaunchWindowInstance = nullptr; PreLaunchWindow::PreLaunchWindow(QString title) { - style::internal::StartFonts(); - setWindowIcon(Window::CreateIcon()); setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint); @@ -99,7 +97,6 @@ PreLaunchWindow::~PreLaunchWindow() { PreLaunchLabel::PreLaunchLabel(QWidget *parent) : QLabel(parent) { QFont labelFont(font()); - labelFont.setFamily(style::internal::GetFontOverride(style::internal::FontSemibold)); labelFont.setWeight(QFont::DemiBold); labelFont.setPixelSize(static_cast(parent)->basicSize()); setFont(labelFont); @@ -119,7 +116,6 @@ void PreLaunchLabel::setText(const QString &text) { PreLaunchInput::PreLaunchInput(QWidget *parent, bool password) : QLineEdit(parent) { QFont logFont(font()); - logFont.setFamily(style::internal::GetFontOverride()); logFont.setPixelSize(static_cast(parent)->basicSize()); setFont(logFont); @@ -140,7 +136,6 @@ PreLaunchInput::PreLaunchInput(QWidget *parent, bool password) : QLineEdit(paren PreLaunchLog::PreLaunchLog(QWidget *parent) : QTextEdit(parent) { QFont logFont(font()); - logFont.setFamily(style::internal::GetFontOverride()); logFont.setPixelSize(static_cast(parent)->basicSize()); setFont(logFont); @@ -163,7 +158,6 @@ PreLaunchButton::PreLaunchButton(QWidget *parent, bool confirm) : QPushButton(pa setObjectName(confirm ? "confirm" : "cancel"); QFont closeFont(font()); - closeFont.setFamily(style::internal::GetFontOverride(style::internal::FontSemibold)); closeFont.setWeight(QFont::DemiBold); closeFont.setPixelSize(static_cast(parent)->basicSize()); setFont(closeFont); @@ -183,7 +177,6 @@ PreLaunchCheckbox::PreLaunchCheckbox(QWidget *parent) : QCheckBox(parent) { setCheckState(Qt::Checked); QFont closeFont(font()); - closeFont.setFamily(style::internal::GetFontOverride(style::internal::FontSemibold)); closeFont.setWeight(QFont::DemiBold); closeFont.setPixelSize(static_cast(parent)->basicSize()); setFont(closeFont);