diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:18:34 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:18:34 +0200 |
| commit | e0727702ea00c975361cf94b4d2903a9fec6f6f8 (patch) | |
| tree | d64f1cf4ebf58a08fb7fc197206ce31fab2aa115 /indra/llmessage/llproxy.cpp | |
| parent | c5195905b8c9b30a2b3aab652aa9828e9825c42f (diff) | |
| parent | e58b5263598368b6dec4a836c72c69b50d701911 (diff) | |
Merge branch 'DRTVWR-501' into trunk
Diffstat (limited to 'indra/llmessage/llproxy.cpp')
| -rw-r--r-- | indra/llmessage/llproxy.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp index dea03aab85..950599217f 100644 --- a/indra/llmessage/llproxy.cpp +++ b/indra/llmessage/llproxy.cpp @@ -403,8 +403,11 @@ LLSocks5AuthType LLProxy::getSelectedAuthMethod() const //static void LLProxy::cleanupClass() { - getInstance()->stopSOCKSProxy(); - deleteSingleton(); + if (instanceExists()) + { + getInstance()->stopSOCKSProxy(); + deleteSingleton(); + } } /** |