From c4d143146c295e81c1fac2ec7f4c02447f55d1b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 25 Apr 2008 11:39:47 +0000 Subject: [PATCH] * fDragBitmap was never initialized, leading to occasional crashes after the first mouse click. * Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25155 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/EventDispatcher.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/servers/app/EventDispatcher.cpp b/src/servers/app/EventDispatcher.cpp index ab5daca8ff..0efb2a4764 100644 --- a/src/servers/app/EventDispatcher.cpp +++ b/src/servers/app/EventDispatcher.cpp @@ -239,6 +239,7 @@ EventDispatcher::EventDispatcher() fNextLatestMouseMoved(NULL), fLastButtons(0), fLastUpdate(system_time()), + fDragBitmap(NULL), fCursorLock("cursor loop lock"), fHWInterface(NULL), fDesktop(NULL) @@ -568,10 +569,9 @@ EventDispatcher::SetDragMessage(BMessage& message, if (fDragBitmap != bitmap) { if (fDragBitmap) gBitmapManager->DeleteBitmap(fDragBitmap); - fDragBitmap = bitmap; - - if (fDragBitmap) + + if (fDragBitmap != NULL) fDragBitmap->Acquire(); } @@ -705,8 +705,7 @@ EventDispatcher::_DeliverDragMessage() fDraggingMessage = false; fHWInterface->SetDragBitmap(NULL, B_ORIGIN); - if (fDragBitmap) - gBitmapManager->DeleteBitmap(fDragBitmap); + gBitmapManager->DeleteBitmap(fDragBitmap); fDragBitmap = NULL; }