diff options
| author | jak1 <mike.wollmann@gmail.com> | 2021-06-06 14:24:49 +0200 |
|---|---|---|
| committer | jak1 <mike.wollmann@gmail.com> | 2021-06-06 14:24:49 +0200 |
| commit | 825ef1e963fd8a30e04e69f676eecc90e601f4e1 (patch) | |
| tree | 593221735bbd9cce62cfc34db1f706d20d5c9d92 /src/progs | |
| parent | 534de91101fca098a8cc3878295cf4ce529810b7 (diff) | |
| download | mv-825ef1e963fd8a30e04e69f676eecc90e601f4e1.tar.gz mv-825ef1e963fd8a30e04e69f676eecc90e601f4e1.tar.bz2 mv-825ef1e963fd8a30e04e69f676eecc90e601f4e1.tar.xz mv-825ef1e963fd8a30e04e69f676eecc90e601f4e1.zip | |
added exitcode 7 to unique sessions (-S)
Diffstat (limited to 'src/progs')
| -rw-r--r-- | src/progs/manaplus/actions/actions.cpp | 11 | ||||
| -rw-r--r-- | src/progs/manaplus/client.cpp | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp index 6f9bf56b9..52eca62d9 100644 --- a/src/progs/manaplus/actions/actions.cpp +++ b/src/progs/manaplus/actions/actions.cpp @@ -1236,9 +1236,14 @@ impHandler0(cacheInfo) impHandler0(disconnect) { - if (gameHandler != nullptr) - gameHandler->disconnect2(); - return true; + if (!settings.options.uniqueSession) + { + if (gameHandler != nullptr) + gameHandler->disconnect2(); + return true; + } + else + return false; } impHandler(undress) diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp index 5b86774b4..d8ba7e1c2 100644 --- a/src/progs/manaplus/client.cpp +++ b/src/progs/manaplus/client.cpp @@ -1700,7 +1700,7 @@ int Client::gameExec() PROFILER_END(); } - return 0; + return settings.exitcode; } void Client::optionChanged(const std::string &name) |