diff options
| author | Tannin <sherb@gmx.net> | 2016-06-05 14:16:55 +0200 |
|---|---|---|
| committer | Tannin <sherb@gmx.net> | 2016-06-05 14:16:55 +0200 |
| commit | fcebf21c446500af79bf58486db503257bb4bc30 (patch) | |
| tree | 9ddda10e4dd263e3a65d895406b6a5c062957f7d | |
| parent | 3d1dfadb4098b3f242bfcad0735cd15e0b07e213 (diff) | |
fixed startup errors
| -rw-r--r-- | src/instancemanager.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp index f7b953ad..a9182d52 100644 --- a/src/instancemanager.cpp +++ b/src/instancemanager.cpp @@ -196,7 +196,7 @@ QString InstanceManager::determineDataPath() } } - if (instanceId.isEmpty() || !QFileInfo::exists(dataPath)) { + if (instanceId.isEmpty()) { return qApp->applicationDirPath(); } else { setCurrentInstance(instanceId); diff --git a/src/main.cpp b/src/main.cpp index e289453c..6b585b5c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -533,13 +533,13 @@ int runApplication(MOApplication &application, SingleInstance &instance, // pass the remaining parameters to the binary
try {
organizer.startApplication(exeName, arguments, QString(), QString());
+ return 0;
} catch (const std::exception &e) {
reportError(
QObject::tr("failed to start application: %1").arg(e.what()));
return 1;
}
}
- return 0;
}
NexusInterface::instance()->getAccessManager()->startLoginCheck();
|
