jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-26 08:33:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Only enforce single instance if launched with arguments.

Browse source 
Took 5 minutes
This commit is contained in:
Lukas Brübach 2026-04-05 22:32:58 +02:00
parent edf90a9a4a
commit d791e7d0ff
2 changed files with 43 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

41
cockatrice/src/main.cpp
View file

@ -279,18 +279,31 @@ int main(int argc, char *argv[])
SpoilerBackgroundUpdater spoilerBackgroundUpdater;
// --- Handle files or URLs passed at startup ---
SingleInstanceManager instance;
QStringList startupFiles;
// Collect command-line files/URLs
for (int i = 1; i < argc; ++i) {
QString arg = QString::fromLocal8Bit(argv[i]);
startupFiles.append(arg);
startupFiles.append(QString::fromLocal8Bit(argv[i]));
}
if (!instance.tryRun(startupFiles)) {
// Another instance received our files, exit
return 0;
bool hasActivationFiles = !startupFiles.isEmpty();
SingleInstanceManager instance;
if (hasActivationFiles) {
// Activation launch: try to forward
if (!instance.tryRun(startupFiles)) {
// Sent successfully → exit
return 0;
}
// No primary instance → become server
qInfo() << "No existing instance found, becoming primary instance";
} else {
// Plain launch: try to start server, but do not connect to any existing
if (!instance.tryRun(QStringList())) {
// Server already exists → just run independently
qInfo() << "Another instance exists, running independently";
} else {
qInfo() << "No existing instance found, starting server";
}
}
ui.show();
@ -330,18 +343,6 @@ int main(int argc, char *argv[])
}
});
#ifdef Q_OS_MAC
// macOS: handle files opened via Finder after startup
QObject::connect(&app, &QApplication::fileOpen, [&ui](const QString &filePath) {
qDebug() << "macOS opened file:" << filePath;
std::optional<LoadedDeck> deckOpt =
DeckLoader::loadFromFile(filePath, DeckFileFormat::getFormatFromName(filePath), true);
if (deckOpt) {
ui.getTabSupervisor()->openDeckInNewTab(deckOpt.value());
}
});
#endif
int ret = app.exec();
qCInfo(MainLog) << "Event loop finished, terminating...";