maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Explicitly unlock _mruPeasants when we are done with it to prevent a deadlock from being introduced.

Browse source
This commit is contained in:
Schuyler Rosefield 2021-09-16 14:55:38 -04:00
parent e1c2f5380f
commit 80646b33a4
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cascadia/Remoting/Monarch.cpp
View file

@ -446,8 +446,10 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
std::shared_lock lock{ _mruPeasantsMutex };
if (_mruPeasants.empty())
{
// unlock the mruPeasants mutex to make sure we can't deadlock here.
lock.unlock();
// Only need a shared lock for read
std::shared_lock lock{ _peasantsMutex };
std::shared_lock peasantsLock{ _peasantsMutex };
// We haven't yet been told the MRU peasant. Just use the first one.
// This is just gonna be a random one, but really shouldn't happen
// in practice. The WindowManager should set the MRU peasant