[haiku-commits] haiku: hrev45324 - src/apps/deskbar
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 25 Feb 2013 22:03:06 +0100 (CET)
hrev45324 adds 1 changeset to branch 'master'
old head: b37d5096dccf849583d0ce61c891558687b4ede9
new head: d06f58081ace6aa75f70167c850ddff722574b1f
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=d06f580+%5Eb37d509
----------------------------------------------------------------------------
d06f580: Revert "Prevent a deadlock condition in Deskbar. Fixes #8539"
This reverts commit 733be65954f85c0c0cd57d0bec95d8a47f9d1f4a.
It didn't fix the bug, will try again.
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45324
Commit: d06f58081ace6aa75f70167c850ddff722574b1f
URL: http://cgit.haiku-os.org/haiku/commit/?id=d06f580
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Mon Feb 25 20:53:55 2013 UTC
Ticket: https://dev.haiku-os.org/ticket/8539
----------------------------------------------------------------------------
1 file changed, 8 deletions(-)
src/apps/deskbar/ExpandoMenuBar.cpp | 8 --------
----------------------------------------------------------------------------
diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp
b/src/apps/deskbar/ExpandoMenuBar.cpp
index 0750997..21fbcff 100644
--- a/src/apps/deskbar/ExpandoMenuBar.cpp
+++ b/src/apps/deskbar/ExpandoMenuBar.cpp
@@ -195,14 +195,6 @@ TExpandoMenuBar::DetachedFromWindow()
if (sMonThread != B_ERROR) {
sDoMonitor = false;
- if (Window()->IsLocked()) {
- // If window is locked by the menu_tracking thread kill
it
- // to prevent a deadlock. See ticket #8539.
- thread_id menu_tracking = find_thread("menu_tracking");
- if (menu_tracking != B_NAME_NOT_FOUND)
- kill_thread(menu_tracking);
- }
-
status_t returnCode;
wait_for_thread(sMonThread, &returnCode);
Other related posts:
