From 2be8427e017e69c58c320304e22f7a465cbce793 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Wed, 4 Aug 2010 21:40:43 +0000 Subject: [PATCH] Remove debugger call. This assert is to early because the desktop is locked later in the LockedDesktopSettings sub class. Fix bug #6392. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37909 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/DesktopSettings.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/servers/app/DesktopSettings.cpp b/src/servers/app/DesktopSettings.cpp index 1a56a9fe6e..f6ea28e20c 100644 --- a/src/servers/app/DesktopSettings.cpp +++ b/src/servers/app/DesktopSettings.cpp @@ -738,11 +738,7 @@ DesktopSettings::DesktopSettings(Desktop* desktop) : fSettings(desktop->fSettings) { -#if DEBUG - if (!desktop->fWindowLock.IsWriteLocked() - && !desktop->fWindowLock.IsReadLocked()) - debugger("desktop not locked when trying to access settings"); -#endif + } @@ -883,7 +879,8 @@ DesktopSettings::IsSubpixelOrderingRegular() const LockedDesktopSettings::LockedDesktopSettings(Desktop* desktop) - : DesktopSettings(desktop), + : + DesktopSettings(desktop), fDesktop(desktop) { #if DEBUG