w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-07 08:24:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Bill Somerville
2018-12-10 00:46:07 +00:00
parent 195b8d002a 784f75ea74
commit 9ef5699c7e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widgets/mainwindow.cpp
+4 -3
View File
@@ -35,6 +35,7 @@
#include <QActionGroup>
#include <QSplashScreen>
#include <QUdpSocket>
#include <QAbstractItemView>
#include "revision_utils.hpp"
#include "qt_helpers.hpp"
@@ -945,10 +946,10 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
splashTimer.setSingleShot (true);
splashTimer.start (20 * 1000);
if(QCoreApplication::applicationVersion().contains("-devel") or
QCoreApplication::applicationVersion().contains("-rc")) {
//if(QCoreApplication::applicationVersion().contains("-devel") or
// QCoreApplication::applicationVersion().contains("-rc")) {
QTimer::singleShot (0, this, SLOT (not_GA_warning_message ()));
}
//}
if(!ui->cbMenus->isChecked()) {
ui->cbMenus->setChecked(true);