dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exclude version and path from singleapplication, dont start if message

Browse Source 
could not be sent.
This commit is contained in:
Jonas Kvinge
2019-05-20 18:41:12 +02:00
parent 67d070c334
commit ba741fbce8
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.cpp
View File

@@ -135,7 +135,7 @@ int main(int argc, char* argv[]) {
{ {
// Only start a core application now so we can check if there's another instance without requiring an X server. // Only start a core application now so we can check if there's another instance without requiring an X server.
// This MUST be done before parsing the commandline options so QTextCodec gets the right system locale for filenames. // This MUST be done before parsing the commandline options so QTextCodec gets the right system locale for filenames.
SingleCoreApplication core_app(argc, argv, true, SingleCoreApplication::Mode::User); SingleCoreApplication core_app(argc, argv, true, SingleCoreApplication::Mode::User | SingleCoreApplication::Mode::ExcludeAppVersion | SingleCoreApplication::Mode::ExcludeAppPath);
Utilities::CheckPortable(); Utilities::CheckPortable();
// Parse commandline options - need to do this before starting the full QApplication so it works without an X server // Parse commandline options - need to do this before starting the full QApplication so it works without an X server
if (!options.Parse()) return 1; if (!options.Parse()) return 1;
@@ -144,10 +144,8 @@ int main(int argc, char* argv[]) {
if (options.is_empty()) { if (options.is_empty()) {
qLog(Info) << "Strawberry is already running - activating existing window (1)"; qLog(Info) << "Strawberry is already running - activating existing window (1)";
} }
if (core_app.sendMessage(options.Serialize(), 5000)) { core_app.sendMessage(options.Serialize(), 5000);
return 0; return 0;
}
// Couldn't send the message so start anyway
} }
} }
@@ -168,15 +166,13 @@ int main(int argc, char* argv[]) {
// important: Do not remove this. // important: Do not remove this.
// This must also be done as a SingleApplication, in case SingleCoreApplication was compiled with a different appdata. // This must also be done as a SingleApplication, in case SingleCoreApplication was compiled with a different appdata.
SingleApplication a(argc, argv, true, SingleApplication::Mode::User); SingleApplication a(argc, argv, true, SingleApplication::Mode::User | SingleApplication::Mode::ExcludeAppVersion | SingleApplication::Mode::ExcludeAppPath);
if (a.isSecondary()) { if (a.isSecondary()) {
if (options.is_empty()) { if (options.is_empty()) {
qLog(Info) << "Strawberry is already running - activating existing window (2)"; qLog(Info) << "Strawberry is already running - activating existing window (2)";
} }
if (a.sendMessage(options.Serialize(), 5000)) { a.sendMessage(options.Serialize(), 5000);
return 0; return 0;
}
// Couldn't send the message so start anyway
} }
#if defined(Q_OS_MACOS) && defined(USE_BUNDLE) #if defined(Q_OS_MACOS) && defined(USE_BUNDLE)