mirror of
https://github.com/transmission/transmission
synced 2025-03-09 05:14:09 +00:00
ensure everything is deallocated properly on quit, libtransmission is closed properly, and inspector window height is remembered
This commit is contained in:
parent
a960174fdf
commit
fc432f1c29
2 changed files with 23 additions and 29 deletions
|
@ -182,29 +182,6 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
|
|||
return self;
|
||||
}
|
||||
|
||||
- (void) dealloc
|
||||
{
|
||||
[[NSNotificationCenter defaultCenter] removeObserver: self];
|
||||
|
||||
[fInfoController release];
|
||||
[fMessageController release];
|
||||
[fPrefsController release];
|
||||
|
||||
[fTorrents release];
|
||||
[fDisplayedTorrents release];
|
||||
|
||||
[fBadger release];
|
||||
[fOverlayWindow release];
|
||||
[fIPCController release];
|
||||
|
||||
[fAutoImportedNames release];
|
||||
[fPendingTorrentDownloads release];
|
||||
[fTempTorrentFiles release];
|
||||
|
||||
tr_close(fLib);
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (void) awakeFromNib
|
||||
{
|
||||
[fBottomBar setBackgroundImage: [NSImage imageNamed: @"BottomBorder.png"]];
|
||||
|
@ -608,6 +585,26 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
|
|||
while ([start timeIntervalSinceNow] >= -5.0
|
||||
&& (tr_torrentCount(fLib) > 0 || tr_handleStatus(fLib)->natTraversalStatus != TR_NAT_TRAVERSAL_DISABLED))
|
||||
usleep(100000);
|
||||
|
||||
//remaining calls the same as dealloc
|
||||
[[NSNotificationCenter defaultCenter] removeObserver: self];
|
||||
|
||||
[fInfoController release];
|
||||
[fMessageController release];
|
||||
[fPrefsController release];
|
||||
|
||||
[fTorrents release];
|
||||
[fDisplayedTorrents release];
|
||||
|
||||
[fBadger release];
|
||||
[fOverlayWindow release];
|
||||
[fIPCController release];
|
||||
|
||||
[fAutoImportedNames release];
|
||||
[fPendingTorrentDownloads release];
|
||||
[fTempTorrentFiles release];
|
||||
|
||||
tr_close(fLib);
|
||||
}
|
||||
|
||||
- (void) handleOpenContentsEvent: (NSAppleEventDescriptor *) event replyEvent: (NSAppleEventDescriptor *) replyEvent
|
||||
|
|
|
@ -159,12 +159,10 @@ typedef enum
|
|||
|
||||
- (void) dealloc
|
||||
{
|
||||
#warning not called?
|
||||
float viewHeight = [[self tabViewForTag: fCurrentTabTag] frame].size.height;
|
||||
|
||||
//save resizeable view height
|
||||
if (fCurrentTabTag == TAB_PEERS_TAG || fCurrentTabTag == TAB_FILES_TAG)
|
||||
[[NSUserDefaults standardUserDefaults] setFloat: viewHeight forKey: @"InspectorContentHeight"];
|
||||
[[NSUserDefaults standardUserDefaults] setFloat: [[self tabViewForTag: fCurrentTabTag] frame].size.height
|
||||
forKey: @"InspectorContentHeight"];
|
||||
|
||||
[[NSNotificationCenter defaultCenter] removeObserver: self];
|
||||
|
||||
|
@ -199,8 +197,7 @@ typedef enum
|
|||
}
|
||||
else
|
||||
{
|
||||
[fNameField setStringValue: NSLocalizedString(@"No Torrents Selected",
|
||||
"Inspector -> above tabs -> selected torrents")];
|
||||
[fNameField setStringValue: NSLocalizedString(@"No Torrents Selected", "Inspector -> above tabs -> selected torrents")];
|
||||
[fSizeField setStringValue: @""];
|
||||
|
||||
[fHaveField setStringValue: @""];
|
||||
|
|
Loading…
Add table
Reference in a new issue