From d0b2c3e1b87b2fb70f058ea08592fcbb9ffcb6c0 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sun, 29 Jun 2008 21:03:34 +0000 Subject: [PATCH] Remove locking when drawing the decorator buttons. This is most probably not correct, but it prevents a deadlock that could sometimes be seen right after booting when the Terminal was supposed to draw the decorator buttons. It doesn't seem to cause any problems with locking removed (the original drawing code didn't lock either). Added a TODO to investigate and eventually fix that though. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26170 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/DefaultDecorator.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/servers/app/DefaultDecorator.cpp b/src/servers/app/DefaultDecorator.cpp index fc40b06505..16513ef126 100644 --- a/src/servers/app/DefaultDecorator.cpp +++ b/src/servers/app/DefaultDecorator.cpp @@ -1093,13 +1093,13 @@ DefaultDecorator::_DrawButtonBitmap(ServerBitmap *bitmap, BRect rect) if (bitmap == NULL) return; - if (fDrawingEngine->LockParallelAccess()) { - bool copyToFrontEnabled = fDrawingEngine->CopyToFrontEnabled(); - fDrawingEngine->SetCopyToFrontEnabled(true); - fDrawingEngine->DrawBitmap(bitmap, rect.OffsetToCopy(0, 0), rect); - fDrawingEngine->SetCopyToFrontEnabled(copyToFrontEnabled); - fDrawingEngine->UnlockParallelAccess(); - } + // TODO: find out why locking sometimes deadlocks here and re-add locking + // once the problem is fixed (or remove this comment if locking isn't + // necessary at all...) + bool copyToFrontEnabled = fDrawingEngine->CopyToFrontEnabled(); + fDrawingEngine->SetCopyToFrontEnabled(true); + fDrawingEngine->DrawBitmap(bitmap, rect.OffsetToCopy(0, 0), rect); + fDrawingEngine->SetCopyToFrontEnabled(copyToFrontEnabled); }