From d06f58081ace6aa75f70167c850ddff722574b1f Mon Sep 17 00:00:00 2001 From: John Scipione Date: Mon, 25 Feb 2013 15:53:55 -0500 Subject: [PATCH] Revert "Prevent a deadlock condition in Deskbar. Fixes #8539" This reverts commit 733be65954f85c0c0cd57d0bec95d8a47f9d1f4a. It didn't fix the bug, will try again. --- src/apps/deskbar/ExpandoMenuBar.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp b/src/apps/deskbar/ExpandoMenuBar.cpp index 07509971c0..21fbcffb02 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);