diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp index cb4895c89..31798dc59 100644 --- a/Telegram/SourceFiles/boxes/about_box.cpp +++ b/Telegram/SourceFiles/boxes/about_box.cpp @@ -88,8 +88,10 @@ void AboutBox::resizeEvent(QResizeEvent *e) { void AboutBox::showVersionHistory() { if (cRealAlphaVersion()) { auto url = qsl("https://tdesktop.com/"); - if (Platform::IsWindows()) { + if (Platform::IsWindows32Bit()) { url += qsl("win/%1.zip"); + } else if (Platform::IsWindows64Bit()) { + url += qsl("win64/%1.zip"); } else if (Platform::IsOSXBuild()) { url += qsl("osx/%1.zip"); } else if (Platform::IsMac()) { @@ -143,5 +145,8 @@ QString currentVersionText() { } else if (AppBetaVersion) { result += " beta"; } + if (Platform::IsWindows64Bit()) { + result += " x64"; + } return result; } diff --git a/Telegram/SourceFiles/core/crash_reports.cpp b/Telegram/SourceFiles/core/crash_reports.cpp index d0e403968..eef6bc32f 100644 --- a/Telegram/SourceFiles/core/crash_reports.cpp +++ b/Telegram/SourceFiles/core/crash_reports.cpp @@ -318,12 +318,36 @@ bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context, #endif // !DESKTOP_APP_DISABLE_CRASH_REPORTS } // namespace +if (Platform::IsWindowsStoreBuild()) { + return Platform::IsWindows64Bit() + ? "WinStore64Bit" + : "WinStore32Bit"; +} else if (Platform::IsWindows32Bit()) { + return "Windows32Bit"; +} else if (Platform::IsWindows64Bit()) { + return "Windows64Bit"; +} else if (Platform::IsMacStoreBuild()) { + return "MacAppStore"; +} else if (Platform::IsOSXBuild()) { + return "OSX"; +} else if (Platform::IsMac()) { + return "MacOS"; +} else if (Platform::IsLinux32Bit()) { + return "Linux32Bit"; +} else if (Platform::IsLinux64Bit()) { + return "Linux64bit"; +} +Unexpected("Platform in CrashReports::PlatformString."); QString PlatformString() { if (Platform::IsWindowsStoreBuild()) { - return qsl("WinStore"); - } else if (Platform::IsWindows()) { - return qsl("Windows"); + return Platform::IsWindows64Bit() + ? qsl("WinStore64Bit") + : qsl("WinStore32Bit"); + } else if (Platform::IsWindows32Bit()) { + return qsl("Windows32Bit"); + } else if (Platform::IsWindows64Bit()) { + return qsl("Windows64Bit"); } else if (Platform::IsMacStoreBuild()) { return qsl("MacAppStore"); } else if (Platform::IsOSXBuild()) { diff --git a/Telegram/lib_base b/Telegram/lib_base index f770025cc..2bf29ab1a 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit f770025cc18e2fba295733923a527c8cb0f1d513 +Subproject commit 2bf29ab1a5458003c8ed250886e08c61cce5ff72 diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc index de46d688f..af7269454 160000 --- a/Telegram/lib_webrtc +++ b/Telegram/lib_webrtc @@ -1 +1 @@ -Subproject commit de46d688f0fb6a04b0607dff892016d99e01e8b6 +Subproject commit af7269454c371b7e1045429d60cd728f7580ee4a