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

fix bug that causes dead-lock under Linux

Browse Source
This commit is contained in:
Jinhao 2018-09-22 00:37:36 +08:00
parent a41eb44714
commit 7fea766f99
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/gui/detail/bedrock_posix.cpp
View File

@ -973,7 +973,12 @@ namespace detail
case Expose: case Expose:
if(msgwnd->visible && (msgwnd->root_graph->empty() == false)) if(msgwnd->visible && (msgwnd->root_graph->empty() == false))
{ {
nana::detail::platform_scope_guard lock; nana::internal_scope_guard lock;
//Don't lock this scope using platform-scope-guard. Because it would cause the platform-scope-lock to be locked
//before the internal-scope-guard, and the order of locking would cause dead-lock.
//
//Locks this scope using internal-scope-guard is correct and safe. In the scope, the Xlib functions aren't called
//directly.
if(msgwnd->is_draw_through()) if(msgwnd->is_draw_through())
{ {
msgwnd->other.attribute.root->draw_through(); msgwnd->other.attribute.root->draw_through();