Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-02-14 23:19:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3950 from Coeur/coeur/modalDelegateDeprecated

Browse Source 
Fix 'modalDelegate:' is deprecated to avoid contextInfo leaks.
This commit is contained in:
Mitch Livingston
2022-10-13 07:54:07 -04:00
committed by GitHub
parent ab12eacb1e a3947bc994
commit 20c2fde7ae
7 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
macosx/AboutWindowController.mm
View File

@@ -80,8 +80,7 @@ AboutWindowController* fAboutBoxInstance = nil;
- (IBAction)hideLicense:(id)sender - (IBAction)hideLicense:(id)sender
{ {
[self.fLicenseSheet orderOut:nil]; [self.window endSheet:self.fLicenseSheet];
[NSApp endSheet:self.fLicenseSheet];
} }
@end @end

8
macosx/BlocklistDownloaderViewController.mm
View File

@@ -90,16 +90,14 @@ BlocklistDownloaderViewController* fBLViewController = nil;
- (void)setFinished - (void)setFinished
{ {
[NSApp endSheet:self.fStatusWindow]; [self.fPrefsController.window endSheet:self.fStatusWindow];
[self.fStatusWindow orderOut:self];
fBLViewController = nil; fBLViewController = nil;
} }
- (void)setFailed:(NSString*)error - (void)setFailed:(NSString*)error
{ {
[NSApp endSheet:self.fStatusWindow]; [self.fPrefsController.window endSheet:self.fStatusWindow];
[self.fStatusWindow orderOut:self];
NSAlert* alert = [[NSAlert alloc] init]; NSAlert* alert = [[NSAlert alloc] init];
[alert addButtonWithTitle:NSLocalizedString(@"OK", "Blocklist -> button")]; [alert addButtonWithTitle:NSLocalizedString(@"OK", "Blocklist -> button")];
@@ -109,8 +107,6 @@ BlocklistDownloaderViewController* fBLViewController = nil;
alert.informativeText = error; alert.informativeText = error;
[alert beginSheetModalForWindow:self.fPrefsController.window completionHandler:^(NSModalResponse returnCode) { [alert beginSheetModalForWindow:self.fPrefsController.window completionHandler:^(NSModalResponse returnCode) {
[alert.window orderOut:self];
fBLViewController = nil; fBLViewController = nil;
}]; }];
} }

1
macosx/CreatorWindowController.mm
View File

@@ -687,7 +687,6 @@ NSMutableSet* creatorWindowControllerSet = nil;
alert.informativeText = [NSString stringWithFormat:@"%s (%d)", error->message, error->code]; alert.informativeText = [NSString stringWithFormat:@"%s (%d)", error->message, error->code];
[alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) { [alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
[alert.window orderOut:nil];
[self.window close]; [self.window close];
}]; }];
tr_error_free(error); tr_error_free(error);

5
macosx/FileRenameSheetController.mm
View File

@@ -58,10 +58,11 @@ typedef void (^CompletionBlock)(BOOL);
modalForWindow:(NSWindow*)window modalForWindow:(NSWindow*)window
completionHandler:(void (^)(BOOL))completionHandler completionHandler:(void (^)(BOOL))completionHandler
{ {
// we capture renamer strongly to avoid it being deallocated before completionHandler
__block FileRenameSheetController* strongRenamer = renamer;
[window beginSheet:renamer.window completionHandler:^(NSModalResponse returnCode) { [window beginSheet:renamer.window completionHandler:^(NSModalResponse returnCode) {
completionHandler(returnCode == NSModalResponseOK); completionHandler(returnCode == NSModalResponseOK);
strongRenamer = nil;
[renamer.window orderOut:self];
}]; }];
} }

6
macosx/GroupsPrefsController.mm
View File

@@ -295,8 +295,7 @@
- (IBAction)cancelRules:(id)sender - (IBAction)cancelRules:(id)sender
{ {
[self.groupRulesSheetWindow orderOut:nil]; [self.fTableView.window endSheet:self.groupRulesSheetWindow];
[NSApp endSheet:self.groupRulesSheetWindow];
NSInteger index = [GroupsController.groups indexForRow:self.fTableView.selectedRow]; NSInteger index = [GroupsController.groups indexForRow:self.fTableView.selectedRow];
if (![GroupsController.groups autoAssignRulesForIndex:index]) if (![GroupsController.groups autoAssignRulesForIndex:index])
@@ -309,8 +308,7 @@
- (IBAction)saveRules:(id)sender - (IBAction)saveRules:(id)sender
{ {
[self.groupRulesSheetWindow orderOut:nil]; [self.fTableView.window endSheet:self.groupRulesSheetWindow];
[NSApp endSheet:self.groupRulesSheetWindow];
NSInteger index = [GroupsController.groups indexForRow:self.fTableView.selectedRow]; NSInteger index = [GroupsController.groups indexForRow:self.fTableView.selectedRow];
[GroupsController.groups setUsesAutoAssignRules:YES forIndex:index]; [GroupsController.groups setUsesAutoAssignRules:YES forIndex:index];

2
macosx/StatsWindowController.mm
View File

@@ -159,8 +159,6 @@ tr_session* fLib = NULL;
alert.showsSuppressionButton = YES; alert.showsSuppressionButton = YES;
[alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) { [alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
[alert.window orderOut:nil];
if (alert.suppressionButton.state == NSControlStateValueOn) if (alert.suppressionButton.state == NSControlStateValueOn)
{ {
[NSUserDefaults.standardUserDefaults setBool:NO forKey:@"WarningResetStats"]; [NSUserDefaults.standardUserDefaults setBool:NO forKey:@"WarningResetStats"];

2
macosx/URLSheetWindowController.mm
View File

@@ -68,13 +68,11 @@ NSString* urlString = nil;
- (void)openURLEndSheet:(id)sender - (void)openURLEndSheet:(id)sender
{ {
[self.window orderOut:sender];
[NSApp endSheet:self.window returnCode:1]; [NSApp endSheet:self.window returnCode:1];
} }
- (void)openURLCancelEndSheet:(id)sender - (void)openURLCancelEndSheet:(id)sender
{ {
[self.window orderOut:sender];
[NSApp endSheet:self.window returnCode:0]; [NSApp endSheet:self.window returnCode:0];
} }