anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid the use of a static NSAutoreleasePool.

Browse Source 
This seems to cause crashes on exit from time to time.
This commit is contained in:
Stephan Witt 2015-10-09 08:16:10 +02:00
parent d5f7ed38fc
commit 989c72530e
1 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/support/linkback/LinkBackProxy.m
View File

@ -16,8 +16,6 @@
///////////////////////////////////////////////////////////////////////
static NSAutoreleasePool * pool = nil;
@interface LyXLinkBackClient : NSObject <LinkBackClientDelegate> {
NSMutableSet * keys;
}
@ -173,42 +171,32 @@ static NSAutoreleasePool * pool = nil;
static LyXLinkBackClient * linkBackClient = nil;
void checkAutoReleasePool()
{
if (pool == nil)
pool = [[NSAutoreleasePool alloc] init];
}
int isLinkBackDataInPasteboard()
{
checkAutoReleasePool() ;
{
NSArray * linkBackType = [NSArray arrayWithObjects: LinkBackPboardType, nil];
NSString * ret = [[NSPasteboard generalPasteboard] availableTypeFromArray:linkBackType];
return ret != nil;
}
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
NSArray * linkBackType = [NSArray arrayWithObjects: LinkBackPboardType, nil];
NSString * ret = [[NSPasteboard generalPasteboard] availableTypeFromArray:linkBackType];
[pool release];
return ret != nil;
}
void getLinkBackData(void const * * buf, unsigned * len)
{
checkAutoReleasePool() ;
{
// get linkback data from pasteboard
NSPasteboard * pboard = [NSPasteboard generalPasteboard];
id linkBackData = [pboard propertyListForType:LinkBackPboardType];
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
// get linkback data from pasteboard
NSPasteboard * pboard = [NSPasteboard generalPasteboard];
id linkBackData = [pboard propertyListForType:LinkBackPboardType];
NSData * nsdata
= [NSArchiver archivedDataWithRootObject:linkBackData];
if (nsdata == nil) {
*buf = 0;
*len = 0;
return;
}
NSData * nsdata = [NSArchiver archivedDataWithRootObject:linkBackData];
if (nsdata == nil) {
*buf = 0;
*len = 0;
} else {
*buf = [nsdata bytes];
*len = [nsdata length];
}
[pool release];
}
@ -217,11 +205,12 @@ int editLinkBackFile(char const * docName)
// setup Obj-C and our client
if (linkBackClient == nil)
linkBackClient = [[LyXLinkBackClient alloc] init];
checkAutoReleasePool() ;
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
// FIXME: really UTF8 here?
NSString * nsDocName = [NSString stringWithUTF8String:docName];
return [linkBackClient edit:nsDocName] == YES;
int result = [linkBackClient edit:nsDocName] == YES;
[pool release];
return result;
}
@ -231,10 +220,5 @@ void closeAllLinkBackLinks()
[linkBackClient release];
linkBackClient = nil;
}
if (pool != nil) {
[pool drain];
pool = nil;
}
}