diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-03-30 00:25:16 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-03-30 00:25:16 +0300 |
commit | 5217e6bfb77d8f6e0d955415e9d0edea964908e8 (patch) | |
tree | 33b7436bd46a0807bcf21f3b97a3dc9af9849aa7 /indra/llcommon/llprocess.cpp | |
parent | f6ba8306f0210289f12ccbfde3c43eb4dc3feaed (diff) | |
parent | c7053a6928fd5eafdc935453742e92951ae4e0c1 (diff) |
Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
Diffstat (limited to 'indra/llcommon/llprocess.cpp')
-rw-r--r-- | indra/llcommon/llprocess.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp index 23936f0526..97a38ea992 100644 --- a/indra/llcommon/llprocess.cpp +++ b/indra/llcommon/llprocess.cpp @@ -272,6 +272,14 @@ public: boost::bind(&ReadPipeImpl::tick, this, _1)); } + ~ReadPipeImpl() + { + if (mConnection.connected()) + { + mConnection.disconnect(); + } + } + // Much of the implementation is simply connecting the abstract virtual // methods with implementation data concealed from the base class. virtual std::istream& get_istream() { return mStream; } |