mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfix-1.4.1' into develop

Browse Source
This commit is contained in:
Jinhao 2017-03-28 06:36:31 +08:00
commit 7130cc798c
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/gui/detail/window_manager.cpp
View File

@ -286,7 +286,7 @@ namespace detail
std::recursive_mutex mutex; std::recursive_mutex mutex;
thread_refcount thread; thread_refcount thread;
std::vector<thread_refcount> invoke_stack; std::vector<thread_refcount> records;
}; };
window_manager::revertible_mutex::revertible_mutex() window_manager::revertible_mutex::revertible_mutex()
@ -339,7 +339,7 @@ namespace detail
{ {
std::size_t cnt = impl_->thread.ref; std::size_t cnt = impl_->thread.ref;
impl_->invoke_stack.push_back(impl_->thread); impl_->records.push_back(impl_->thread);
impl_->thread.tid = 0; impl_->thread.tid = 0;
impl_->thread.ref = 0; impl_->thread.ref = 0;
@ -354,20 +354,24 @@ namespace detail
{ {
impl_->mutex.lock(); impl_->mutex.lock();
if(impl_->invoke_stack.size()) if(impl_->records.size())
{ {
auto thr = impl_->invoke_stack.back(); auto const this_tid = nana::system::this_thread_id();
impl_->invoke_stack.pop_back(); for (auto i = impl_->records.begin(); i != impl_->records.end(); ++i)
if(thr.tid == nana::system::this_thread_id())
{ {
for (std::size_t i = 0; i < thr.ref; ++i) if (this_tid != i->tid)
continue;
for (std::size_t u = 1; u < i->ref; ++u)
impl_->mutex.lock(); impl_->mutex.lock();
impl_->thread = thr;
impl_->thread = *i;
impl_->records.erase(i);
return;
} }
else
throw std::runtime_error("The forward is not matched. Please report this issue"); throw std::runtime_error("The forward is not matched. Please report this issue");
} }
impl_->mutex.unlock(); impl_->mutex.unlock();