From 135c6d41e13fd9930b9d0921dc4c67655868444e Mon Sep 17 00:00:00 2001 From: DarkWyrm Date: Wed, 23 Feb 2005 01:42:32 +0000 Subject: [PATCH] A couple tweaks for testing without the registrar running - eliminates a crash git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11456 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/app/Clipboard.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/kits/app/Clipboard.cpp b/src/kits/app/Clipboard.cpp index d9e29d6a17..b4ce9e9abf 100644 --- a/src/kits/app/Clipboard.cpp +++ b/src/kits/app/Clipboard.cpp @@ -39,7 +39,13 @@ #include // Globals --------------------------------------------------------------------- -BClipboard *be_clipboard = NULL; +#ifdef RUN_WITHOUT_REGISTRAR + static BClipboard sClipboard(NULL); + BClipboard *be_clipboard = &sClipboard; +#else + BClipboard *be_clipboard = NULL; +#endif + using namespace BPrivate; @@ -157,10 +163,13 @@ BClipboard::Lock() // Will this work correctly if clipboard is deleted while still waiting on // fLock.Lock() ? bool locked = fLock.Lock(); + +#ifndef RUN_WITHOUT_REGISTRAR if (locked && DownloadFromSystem() != B_OK) { locked = false; fLock.Unlock(); } +#endif return locked; }