gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug getting run loop for current thread if it has not already been set.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@26685 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2008-06-18 13:11:11 +00:00
parent 76578244f7
commit e6b7a3ba07
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/NSConnection.m
View file

@ -91,9 +91,10 @@ static inline NSRunLoop *
GSRunLoopForThread(NSThread *aThread)
{
GSRunLoopThreadInfo *info = GSRunLoopInfoForThread(aThread);
if (info == nil || info->loop == nil)
{
if (aThread == nil)
if (aThread == nil || aThread == GSCurrentThread())
{
return [NSRunLoop currentRunLoop];
}
@ -1886,8 +1887,7 @@ static void retEncoder (DOContext *ctxt)
const char *type;
retval_t retframe;
DOContext ctxt;
NSThread *thread = GSCurrentThread();
NSRunLoop *runLoop = GSRunLoopForThread(thread);
NSRunLoop *runLoop = GSRunLoopForThread(nil);
memset(&ctxt, 0, sizeof(ctxt));
ctxt.connection = self;
@ -2030,8 +2030,7 @@ static void retEncoder (DOContext *ctxt)
BOOL needsResponse;
const char *type;
DOContext ctxt;
NSThread *thread = GSCurrentThread();
NSRunLoop *runLoop = GSRunLoopForThread(thread);
NSRunLoop *runLoop = GSRunLoopForThread(nil);
if ([_runLoops indexOfObjectIdenticalTo: runLoop] == NSNotFound)
{
@ -2494,8 +2493,7 @@ static void callEncoder (DOContext *ctxt)
*/
NS_DURING
{
NSThread *thread = GSCurrentThread();
NSRunLoop *runLoop = GSRunLoopForThread(thread);
NSRunLoop *runLoop = GSRunLoopForThread(nil);
NSParameterAssert (_isValid);
if ([_runLoops indexOfObjectIdenticalTo: runLoop] == NSNotFound)
@ -2761,8 +2759,7 @@ static void callEncoder (DOContext *ctxt)
NSTimeInterval last_interval = 0.0001;
NSTimeInterval delay_interval = last_interval;
NSDate *delay_date = nil;
NSThread *thread = GSCurrentThread();
NSRunLoop *runLoop = GSRunLoopForThread(thread);
NSRunLoop *runLoop = GSRunLoopForThread(nil);
BOOL isLocked = NO;
/*