void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix closing of pre-launch windows.

Browse source
This commit is contained in:
John Preston 2021-05-14 15:51:39 +04:00
parent 316f0537c4
commit bd90cc4134
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Telegram/SourceFiles/core/crash_report_window.cpp
View file

@ -206,6 +206,7 @@ void NotStartedWindow::updateControls() {
void NotStartedWindow::closeEvent(QCloseEvent *e) { void NotStartedWindow::closeEvent(QCloseEvent *e) {
deleteLater(); deleteLater();
App::quit();
} }
void NotStartedWindow::resizeEvent(QResizeEvent *e) { void NotStartedWindow::resizeEvent(QResizeEvent *e) {
@ -964,11 +965,6 @@ void LastCrashedWindow::onUpdateFailed() {
} }
void LastCrashedWindow::onContinue() { void LastCrashedWindow::onContinue() {
if (CrashReports::Restart() == CrashReports::CantOpen) {
new NotStartedWindow();
} else {
_launch();
}
close(); close();
} }
@ -1017,6 +1013,12 @@ void LastCrashedWindow::onSendingProgress(qint64 uploaded, qint64 total) {
void LastCrashedWindow::closeEvent(QCloseEvent *e) { void LastCrashedWindow::closeEvent(QCloseEvent *e) {
deleteLater(); deleteLater();
if (CrashReports::Restart() == CrashReports::CantOpen) {
new NotStartedWindow();
} else {
_launch();
}
} }
void LastCrashedWindow::resizeEvent(QResizeEvent *e) { void LastCrashedWindow::resizeEvent(QResizeEvent *e) {
@ -1142,6 +1144,7 @@ void NetworkSettingsWindow::onSave() {
} }
void NetworkSettingsWindow::closeEvent(QCloseEvent *e) { void NetworkSettingsWindow::closeEvent(QCloseEvent *e) {
deleteLater();
} }
void NetworkSettingsWindow::updateControls() { void NetworkSettingsWindow::updateControls() {

13
Telegram/SourceFiles/core/crash_report_window.h
View file

@ -234,16 +234,3 @@ private:
QWidget *_parent; QWidget *_parent;
}; };
class ShowCrashReportWindow : public PreLaunchWindow {
public:
ShowCrashReportWindow(const QString &text);
protected:
void resizeEvent(QResizeEvent *e);
void closeEvent(QCloseEvent *e);
private:
PreLaunchLog _log;
};