Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2024-12-13 21:02:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix persistence of deleted PCs. Fixes #82

Browse source
This commit is contained in:
Cameron Gutman 2018-09-21 20:20:16 -07:00
parent af9fb0e091
commit e20bf3fbd9
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/backend/computermanager.cpp
View file

@ -423,9 +423,23 @@ public:
void run() void run()
{ {
QWriteLocker lock(&m_ComputerManager->m_Lock); QThread* pollingThread;
QThread* pollingThread = m_ComputerManager->m_PollThreads[m_Computer->uuid]; // Only do the minimum amount of work while holding the writer lock.
// We must release it before calling saveHosts().
{
QWriteLocker lock(&m_ComputerManager->m_Lock);
pollingThread = m_ComputerManager->m_PollThreads[m_Computer->uuid];
m_ComputerManager->m_PollThreads.remove(m_Computer->uuid);
m_ComputerManager->m_KnownHosts.remove(m_Computer->uuid);
}
// Persist the new host list
m_ComputerManager->saveHosts();
// Delete the polling thread
if (pollingThread != nullptr) { if (pollingThread != nullptr) {
pollingThread->requestInterruption(); pollingThread->requestInterruption();
@ -438,9 +452,8 @@ public:
delete pollingThread; delete pollingThread;
} }
m_ComputerManager->m_PollThreads.remove(m_Computer->uuid); // Finally, delete the computer itself. This must be done
m_ComputerManager->m_KnownHosts.remove(m_Computer->uuid); // last because the polling thread might be using it.
delete m_Computer; delete m_Computer;
} }