Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-02-15 07:26:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: crash in torrent rename dialog after torrent removal (#8425)

Browse Source
This commit is contained in:
Charles Kerr
2026-02-14 14:44:31 -06:00
committed by GitHub
parent 45308e8d7d
commit a37ca2a090
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
macosx/Torrent.mm
View File

@@ -196,6 +196,7 @@ bool trashDataFile(char const* filename, void* /*user_data*/, tr_error* error)
[self setTimeMachineExclude:NO]; [self setTimeMachineExclude:NO];
tr_torrentRemove(self.fHandle, trashFiles, trashDataFile, nullptr); tr_torrentRemove(self.fHandle, trashFiles, trashDataFile, nullptr);
_fHandle = nullptr;
} }
- (void)changeDownloadFolderBeforeUsing:(NSString*)folder determinationType:(TorrentDeterminationType)determinationType - (void)changeDownloadFolderBeforeUsing:(NSString*)folder determinationType:(TorrentDeterminationType)determinationType
@@ -821,6 +822,15 @@ bool trashDataFile(char const* filename, void* /*user_data*/, tr_error* error)
NSParameterAssert(newName != nil); NSParameterAssert(newName != nil);
NSParameterAssert(![newName isEqualToString:@""]); NSParameterAssert(![newName isEqualToString:@""]);
if (self.fHandle == nullptr)
{
if (completionHandler != nullptr)
{
completionHandler(NO);
}
return;
}
NSDictionary* contextInfo = @{ @"Torrent" : self, @"CompletionHandler" : [completionHandler copy] }; NSDictionary* contextInfo = @{ @"Torrent" : self, @"CompletionHandler" : [completionHandler copy] };
tr_torrentRenamePath(self.fHandle, tr_torrentName(self.fHandle), newName.UTF8String, renameCallback, (__bridge_retained void*)(contextInfo)); tr_torrentRenamePath(self.fHandle, tr_torrentName(self.fHandle), newName.UTF8String, renameCallback, (__bridge_retained void*)(contextInfo));
@@ -834,6 +844,15 @@ bool trashDataFile(char const* filename, void* /*user_data*/, tr_error* error)
NSParameterAssert(newName != nil); NSParameterAssert(newName != nil);
NSParameterAssert(![newName isEqualToString:@""]); NSParameterAssert(![newName isEqualToString:@""]);
if (self.fHandle == nullptr)
{
if (completionHandler != nullptr)
{
completionHandler(NO);
}
return;
}
NSDictionary* contextInfo = @{ @"Torrent" : self, @"Nodes" : @[ node ], @"CompletionHandler" : [completionHandler copy] }; NSDictionary* contextInfo = @{ @"Torrent" : self, @"Nodes" : @[ node ], @"CompletionHandler" : [completionHandler copy] };
NSString* oldPath = [node.path stringByAppendingPathComponent:node.name]; NSString* oldPath = [node.path stringByAppendingPathComponent:node.name];