summaryrefslogtreecommitdiff
path: root/src/progs/manaplus
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/manaplus')
-rw-r--r--src/progs/manaplus/actions/actions.cpp11
-rw-r--r--src/progs/manaplus/client.cpp2
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)