Browse Source

Merge pull request #7455 from patrickelectric/p

main: Returning critical messsage and an error code when QGC is alredy running
QGC4.4
Gus Grubba 6 years ago committed by GitHub
parent
commit
84c30291db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      src/main.cc

8
src/main.cc

@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
#include <QApplication>
#include <QIcon>
#include <QSslSocket>
#include <QMessageBox>
#include <QProcessEnvironment>
#include <QHostAddress>
#include <QUdpSocket>
@ -222,7 +223,12 @@ int main(int argc, char *argv[]) @@ -222,7 +223,12 @@ int main(int argc, char *argv[])
#ifndef __mobile__
RunGuard guard("QGroundControlRunGuardKey");
if (!guard.tryToRun()) {
return 0;
// QApplication is necessary to use QMessageBox
QApplication errorApp(argc, argv);
QMessageBox::critical(nullptr, QObject::tr("Error"),
QObject::tr("A second instance of QGroundControl is already running. Please close the other instance and try again.")
);
return -1;
}
#endif

Loading…
Cancel
Save