From 6f0303206e38c2a75afa6aa401590b4648dc5004 Mon Sep 17 00:00:00 2001 From: Vitalya Date: Thu, 27 Apr 2023 17:21:03 +0300 Subject: [PATCH 1/3] Move two functions into separate file --- CMakeLists.txt | 1 + src/main.cpp | 22 +--------------------- src/utils.cpp | 22 ++++++++++++++++++++++ src/utils.h | 10 ++++++++++ 4 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 src/utils.cpp create mode 100644 src/utils.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 48544ac..49ae026 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,6 +45,7 @@ set(discord-screenaudio_SRC src/log.cpp src/userscript.cpp src/centralwidget.cpp + src/utils.cpp resources.qrc ) diff --git a/src/main.cpp b/src/main.cpp index 14fddb3..9cd4914 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,6 @@ #include "mainwindow.h" #include "virtmic.h" +#include "utils.h" #ifdef KXMLGUI #include @@ -12,27 +13,6 @@ #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); diff --git a/src/utils.cpp b/src/utils.cpp new file mode 100644 index 0000000..3efa9ad --- /dev/null +++ b/src/utils.cpp @@ -0,0 +1,22 @@ +#include "utils.h" + +bool isProgramRunning(const QString &program_name) { + QLocalSocket socket; + socket.connectToServer(program_name); + if (socket.waitForConnected()) { + return true; // program is already running + } + return false; +} + +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(); +} diff --git a/src/utils.h b/src/utils.h new file mode 100644 index 0000000..40e3568 --- /dev/null +++ b/src/utils.h @@ -0,0 +1,10 @@ +#pragma once +#include "mainwindow.h" + +#include +#include +#include + + +bool isProgramRunning(const QString &program_name); +void showErrorMessage(const char *text); From c15250498b7368d151bdf71404946c743769d140 Mon Sep 17 00:00:00 2001 From: Vitalya Date: Thu, 27 Apr 2023 19:52:28 +0300 Subject: [PATCH 2/3] Move server function to the bottom and change "utils" file name to "localserver" --- CMakeLists.txt | 2 +- src/{utils.cpp => localserver.cpp} | 2 +- src/{utils.h => localserver.h} | 1 - src/main.cpp | 27 +++++++++++++++------------ 4 files changed, 17 insertions(+), 15 deletions(-) rename src/{utils.cpp => localserver.cpp} (95%) rename src/{utils.h => localserver.h} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49ae026..5d36013 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ set(discord-screenaudio_SRC src/log.cpp src/userscript.cpp src/centralwidget.cpp - src/utils.cpp + src/localserver.cpp resources.qrc ) diff --git a/src/utils.cpp b/src/localserver.cpp similarity index 95% rename from src/utils.cpp rename to src/localserver.cpp index 3efa9ad..3081794 100644 --- a/src/utils.cpp +++ b/src/localserver.cpp @@ -1,4 +1,4 @@ -#include "utils.h" +#include "localserver.h" bool isProgramRunning(const QString &program_name) { QLocalSocket socket; diff --git a/src/utils.h b/src/localserver.h similarity index 99% rename from src/utils.h rename to src/localserver.h index 40e3568..71eaf5f 100644 --- a/src/utils.h +++ b/src/localserver.h @@ -5,6 +5,5 @@ #include #include - bool isProgramRunning(const QString &program_name); void showErrorMessage(const char *text); diff --git a/src/main.cpp b/src/main.cpp index 9cd4914..ba2b8b0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,6 @@ #include "mainwindow.h" #include "virtmic.h" -#include "utils.h" +#include "localserver.h" #ifdef KXMLGUI #include @@ -16,18 +16,7 @@ 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-screenaudio 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( @@ -68,6 +57,20 @@ int main(int argc, char *argv[]) { qgetenv("QTWEBENGINE_CHROMIUM_FLAGS")); MainWindow w(parser.isSet(notifySendOption)); + + // Check if discord is already running + QString program_name = "discord-screenaudio"; + if (isProgramRunning(program_name)) { + // if running show error message + showErrorMessage("discord-screenaudio 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, []() {}); + w.show(); return app.exec(); From 47fd6208766292e986170549ae7a81ca2d8db6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Thu, 27 Apr 2023 20:04:04 +0200 Subject: [PATCH 3/3] fix formatting --- src/main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index ba2b8b0..1cd38cc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,6 @@ +#include "localserver.h" #include "mainwindow.h" #include "virtmic.h" -#include "localserver.h" #ifdef KXMLGUI #include @@ -16,8 +16,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - - QApplication::setApplicationName("discord-screenaudio"); QApplication::setWindowIcon( QIcon(":assets/de.shorsh.discord-screenaudio.png"));