From b582584c69265f8bf531567568f0a9756c683b74 Mon Sep 17 00:00:00 2001 From: Vitalya Date: Mon, 24 Apr 2023 19:58:56 +0300 Subject: [PATCH 1/3] Shows error message to user if discord is running --- src/main.cpp | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index df1fec8..d47b266 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,9 +8,50 @@ #include #include #include +#include +#include +#include + +void showErrorMessage(const char* text) { + QMessageBox msgBox; + + msgBox.setIcon(QMessageBox::Critical); + msgBox.setText(text); + msgBox.setStandardButtons(QMessageBox::Ok); + msgBox.setDefaultButton(QMessageBox::Ok); + msgBox.setWindowIcon( + QIcon(":assets/de.shorsh.discord-screenaudio.png")); + + msgBox.exec(); +} + + +bool isProgramRunning(const QString& program_name) +{ + QLocalSocket socket; + socket.connectToServer(program_name); + if (socket.waitForConnected()) { + return true; // program is already running + } + return false; +} int main(int argc, char *argv[]) { QApplication app(argc, argv); + + // Check if discord is already running + QString program_name = "discord-screenaudio"; + if (isProgramRunning(program_name)) { + // if running show error message + showErrorMessage("Discord is already running"); + return 1; + } + + // open server so we can check if discord is running + QLocalServer server; + server.listen(program_name); + QObject::connect(&server, &QLocalServer::newConnection, [](){}); + QApplication::setApplicationName("discord-screenaudio"); QApplication::setWindowIcon( QIcon(":assets/de.shorsh.discord-screenaudio.png")); From 6c9b76ed90a7c2c9be3706a02e02d25836024a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Mon, 24 Apr 2023 22:41:36 +0200 Subject: [PATCH 2/3] format code --- src/main.cpp | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index d47b266..4ef94b7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,33 +7,30 @@ #include #include +#include +#include #include #include -#include -#include -void showErrorMessage(const char* text) { +void showErrorMessage(const char *text) { QMessageBox msgBox; msgBox.setIcon(QMessageBox::Critical); msgBox.setText(text); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok); - msgBox.setWindowIcon( - QIcon(":assets/de.shorsh.discord-screenaudio.png")); + msgBox.setWindowIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png")); msgBox.exec(); } - -bool isProgramRunning(const QString& program_name) -{ - QLocalSocket socket; - socket.connectToServer(program_name); - if (socket.waitForConnected()) { - return true; // program is already running - } - return false; +bool isProgramRunning(const QString &program_name) { + QLocalSocket socket; + socket.connectToServer(program_name); + if (socket.waitForConnected()) { + return true; // program is already running + } + return false; } int main(int argc, char *argv[]) { @@ -42,15 +39,15 @@ int main(int argc, char *argv[]) { // Check if discord is already running QString program_name = "discord-screenaudio"; if (isProgramRunning(program_name)) { - // if running show error message - showErrorMessage("Discord is already running"); - return 1; + // if running show error message + showErrorMessage("Discord is already running"); + return 1; } // open server so we can check if discord is running QLocalServer server; server.listen(program_name); - QObject::connect(&server, &QLocalServer::newConnection, [](){}); + QObject::connect(&server, &QLocalServer::newConnection, []() {}); QApplication::setApplicationName("discord-screenaudio"); QApplication::setWindowIcon( From 798fb3d5e44f7a887f6cb98a553c31aa139eec38 Mon Sep 17 00:00:00 2001 From: Vitalya Date: Tue, 25 Apr 2023 15:07:25 +0300 Subject: [PATCH 3/3] Minor change in error message Change "Discord" to "discord-screenaudio" in error message --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 4ef94b7..14fddb3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) { QString program_name = "discord-screenaudio"; if (isProgramRunning(program_name)) { // if running show error message - showErrorMessage("Discord is already running"); + showErrorMessage("discord-screenaudio is already running"); return 1; }