From a0f117bf105919f0bb1a456920be273adcae1abd Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 25 Feb 2018 00:57:45 +0000 Subject: [PATCH] Don't block main window construction with not GA version warning message git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8531 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 18 +++++++++++------- mainwindow.h | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 0b5ecb74c..10f68d439 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -919,13 +919,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, if(QCoreApplication::applicationVersion().contains("-devel") or QCoreApplication::applicationVersion().contains("-rc")) { - QString errorMsg; - MessageBox::critical_message (this, - "This version of WSJT-X was built from code in the\n" - "development branch, or is a beta-level Release Candidate.\n\n" - "On-the-air use carries an obligation to report problems\n" - "to the WSJT Development group and to upgrade to a GA\n" - "(General Availability) release when that is released.\n\n", errorMsg); + QTimer::singleShot (0, this, SLOT (not_GA_warning_message ())); } if(!ui->cbMenus->isChecked()) { @@ -936,6 +930,16 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, if (!m_valid) throw std::runtime_error {"Fatal initialization exception"}; } +void MainWindow::not_GA_warning_message () +{ + MessageBox::critical_message (this, + "This version of WSJT-X was built from code in the\n" + "development branch, or is a beta-level Release Candidate.\n\n" + "On-the-air use carries an obligation to report problems\n" + "to the WSJT Development group and to upgrade to a GA\n" + "(General Availability) release when that is released.\n\n"); +} + void MainWindow::initialize_fonts () { set_application_font (m_config.text_font ()); diff --git a/mainwindow.h b/mainwindow.h index d843a9e82..803995fec 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -292,6 +292,7 @@ private slots: void on_sbMax_dB_valueChanged(int n); void on_pbFoxReset_clicked(); void on_comboBoxHoundSort_activated (int index); + void not_GA_warning_message (); private: Q_SIGNAL void initializeAudioOutputStream (QAudioDeviceInfo,