From ef636873ad1bc7dca65bcd531b3e24a3e0beea35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 28 Jun 2007 20:05:39 +0000 Subject: [PATCH] Fixed the overlay I accidently broke with the last commit - sometimes, but only sometimes, testing seems like a good idea 8-) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21521 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/BitmapManager.cpp | 3 +-- src/servers/app/drawing/Overlay.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/servers/app/BitmapManager.cpp b/src/servers/app/BitmapManager.cpp index 7c1f2dbae4..16771c0eaf 100644 --- a/src/servers/app/BitmapManager.cpp +++ b/src/servers/app/BitmapManager.cpp @@ -127,7 +127,6 @@ BitmapManager::CreateBitmap(ClientMemoryAllocator* allocator, Overlay* overlay = new (std::nothrow) Overlay(hwInterface, bitmap, overlayToken); - const overlay_buffer* overlayBuffer = NULL; overlay_client_data* clientData = NULL; bool newArea = false; @@ -144,7 +143,7 @@ BitmapManager::CreateBitmap(ClientMemoryAllocator* allocator, bitmap->fAllocator = allocator; bitmap->fAllocationCookie = cookie; bitmap->SetOverlay(overlay); - bitmap->fBytesPerRow = overlayBuffer->bytes_per_row; + bitmap->fBytesPerRow = overlay->OverlayBuffer()->bytes_per_row; buffer = (uint8*)overlay->OverlayBuffer()->buffer; if (_allocationFlags) diff --git a/src/servers/app/drawing/Overlay.cpp b/src/servers/app/drawing/Overlay.cpp index 5159216a27..b191ba20b6 100644 --- a/src/servers/app/drawing/Overlay.cpp +++ b/src/servers/app/drawing/Overlay.cpp @@ -59,7 +59,7 @@ Overlay::Overlay(HWInterface& interface, ServerBitmap* bitmap, fHWInterface(interface), fOverlayBuffer(NULL), fClientData(NULL), - fOverlayToken(NULL) + fOverlayToken(token) { fSemaphore = create_sem(1, "overlay lock"); fColor.SetColor(21, 16, 21, 16);