diff options
| author | Mikaël Capelle <capelle.mikael@gmail.com> | 2021-01-06 09:29:15 +0100 |
|---|---|---|
| committer | Mikaël Capelle <capelle.mikael@gmail.com> | 2021-01-06 09:29:15 +0100 |
| commit | 86fb0dc9bde6aafb190a50d49f3f41b1fc774244 (patch) | |
| tree | f583b63177208938462ac70358cfef3ba3e1628a /src/commandline.cpp | |
| parent | fc4b069a875f7afd429e85b8d5590dc5c23d77c5 (diff) | |
| parent | e3e54bc8d3d4a5219c7f2c1f6338b7ecc5d1e8ec (diff) | |
Merge remote-tracking branch 'origin/master' into collapsible-separators
Diffstat (limited to 'src/commandline.cpp')
| -rw-r--r-- | src/commandline.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/commandline.cpp b/src/commandline.cpp index bb9ff9b8..8c722990 100644 --- a/src/commandline.cpp +++ b/src/commandline.cpp @@ -206,9 +206,11 @@ std::optional<int> CommandLine::setupCore(OrganizerCore& organizer) const if (m_shortcut.isValid()) { if (m_shortcut.hasExecutable()) { try { + // make sure MO doesn't exit even if locking is disabled, ForceWait and + // PreventExit will do that organizer.processRunner() .setFromShortcut(m_shortcut) - .setWaitForCompletion() + .setWaitForCompletion(ProcessRunner::ForceWait, UILocker::PreventExit) .run(); return 0; @@ -229,9 +231,12 @@ std::optional<int> CommandLine::setupCore(OrganizerCore& organizer) const try { // pass the remaining parameters to the binary + // + // make sure MO doesn't exit even if locking is disabled, ForceWait and + // PreventExit will do that organizer.processRunner() .setFromFileOrExecutable(exeName, m_untouched) - .setWaitForCompletion() + .setWaitForCompletion(ProcessRunner::ForceWait, UILocker::PreventExit) .run(); return 0; |