i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A couple tweaks for testing without the registrar running - eliminates a crash

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11456 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2005-02-23 01:42:32 +00:00
parent 860d572c2e
commit 135c6d41e1
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Clipboard.cpp
+10 -1
View File
@@ -39,7 +39,13 @@
#include <ClipboardPrivate.h> #include <ClipboardPrivate.h>
// Globals --------------------------------------------------------------------- // 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; using namespace BPrivate;
@@ -157,10 +163,13 @@ BClipboard::Lock()
// Will this work correctly if clipboard is deleted while still waiting on // Will this work correctly if clipboard is deleted while still waiting on
// fLock.Lock() ? // fLock.Lock() ?
bool locked = fLock.Lock(); bool locked = fLock.Lock();
#ifndef RUN_WITHOUT_REGISTRAR
if (locked && DownloadFromSystem() != B_OK) { if (locked && DownloadFromSystem() != B_OK) {
locked = false; locked = false;
fLock.Unlock(); fLock.Unlock();
} }
#endif
return locked; return locked;
} }