macos: disable SingleApplication

This commit is contained in:
tobtoht
2024-09-22 13:57:43 +02:00
parent 60dde9b9ee
commit 26f303ea47
2 changed files with 21 additions and 4 deletions
+13 -1
View File
@@ -5,7 +5,9 @@
#include <QApplication>
#include <QtCore>
#include <QtGui>
#if !defined(Q_OS_MAC)
#include <singleapplication.h>
#endif
#include "config-feather.h"
#include "constants.h"
@@ -64,6 +66,8 @@ void signal_handler(int signum) {
int main(int argc, char *argv[])
{
qDebug() << "Reached main";
Q_INIT_RESOURCE(assets);
#if defined(Q_OS_LINUX) && defined(STACK_TRACE)
@@ -131,12 +135,18 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::Round);
#endif
qDebug() << "Setting up QApplication";
#if defined(Q_OS_MAC)
// https://github.com/itay-grudev/SingleApplication/issues/136#issuecomment-1925441403
QApplication app(argc, argv);
#else
SingleApplication app(argc, argv);
#endif
QApplication::setQuitOnLastWindowClosed(false);
QApplication::setApplicationName("FeatherWallet");
// Setup config directories
QString configDir = Config::defaultConfigDir().path();
QString config_dir_tor = QString("%1/%2").arg(configDir, "tor");
@@ -238,9 +248,11 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
auto wm = windowManager();
wm->setEventFilter(&filter);
#if !defined(Q_OS_MAC)
QObject::connect(&app, &SingleApplication::instanceStarted, [&wm]() {
wm->raise();
});
#endif
return QApplication::exec();
}