From ea0cc0271c4faeda8b344238855cc2f721a17ada Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 22 May 2021 01:37:33 +0100 Subject: [PATCH] Fix merge conflict --- widgets/mainwindow.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index a6a5117a9..8fd7fabba 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1031,14 +1031,14 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, void MainWindow::not_GA_warning_message () { - // MessageBox::critical_message (this, - // "This is a pre-release version of WSJT-X 2.4.0 made\n" - // "available for testing purposes. By design it will\n" - // "be nonfunctional after May 25, 2021."); - // auto now = QDateTime::currentDateTimeUtc (); - // if (now >= QDateTime {{2021, 5, 25}, {23, 59, 59, 999}, Qt::UTC}) { - // Q_EMIT finished (); - // } + MessageBox::critical_message (this, + "This is a pre-release version of WSJT-X 2.4.0 made\n" + "available for testing purposes. By design it will\n" + "be nonfunctional after May 30, 2021."); + auto now = QDateTime::currentDateTimeUtc (); + if (now >= QDateTime {{2021, 5, 30}, {23, 59, 59, 999}, Qt::UTC}) { + Q_EMIT finished (); + } } void MainWindow::initialize_fonts ()