BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Fix mutex double-lock

Browse Source
This commit is contained in:
Scott E. Graves
2017-02-17 13:47:37 -06:00
parent a001377a12
commit 91dd816c8c
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SiaDrive/SiaDriveDlg.cpp
View File

@@ -332,8 +332,8 @@ HRESULT CSiaDriveDlg::OnButtonUnlockWallet(IHTMLElement* /*pElement*/)
QueueUiAction([this]() {
SetWalletUnlockPassword(L"");
AfxMessageBox(L"Invalid password entered");
SetFocusToElement(L"ID_WalletUnlockPwd");
SetBodyEnabled(true);
SetFocusToElement(L"ID_WalletUnlockPwd");
});
}
});
@@ -473,11 +473,17 @@ void CSiaDriveDlg::QueueUiAction(std::function<void()> fn)
void CSiaDriveDlg::ProcessUiActionQueue()
{
std::lock_guard<std::mutex> l(_uiActionQueueMutex);
while (_uiActionQueue.size())
std::deque<std::function<void()>> items;
{
_uiActionQueue.front()();
_uiActionQueue.pop_front();
std::lock_guard<std::mutex> l(_uiActionQueueMutex);
items = _uiActionQueue;
_uiActionQueue.clear();
}
while (items.size())
{
items.front()();
items.pop_front();
}
}