mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: prevent PopUpButtonHandler premature dealloc (#40308)

Browse source 
fix: prevent PopUpButtonHandler dealloc
This commit is contained in:
Shelley Vohr 2023-10-26 11:40:02 -04:00 • committed by GitHub
parent 621b3ba897
commit 3f92a98315
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shell/browser/ui/file_dialog_mac.mm
View file

@ -66,14 +66,18 @@
// Manages the PopUpButtonHandler. // Manages the PopUpButtonHandler.
@interface ElectronAccessoryView : NSView @interface ElectronAccessoryView : NSView
@property(nonatomic, strong) PopUpButtonHandler* popUpButtonHandler;
@end @end
@implementation ElectronAccessoryView @implementation ElectronAccessoryView
@synthesize popUpButtonHandler;
- (void)dealloc { - (void)dealloc {
auto* popupButton = auto* popupButton =
static_cast<NSPopUpButton*>([[self subviews] objectAtIndex:1]); static_cast<NSPopUpButton*>([[self subviews] objectAtIndex:1]);
popupButton.target = nil; popupButton.target = nil;
popUpButtonHandler = nil;
} }
@end @end
@ -149,6 +153,7 @@ void SetAllowedFileTypes(NSSavePanel* dialog, const Filters& filters) {
[accessoryView addSubview:label]; [accessoryView addSubview:label];
[accessoryView addSubview:popupButton]; [accessoryView addSubview:popupButton];
[accessoryView setPopUpButtonHandler:popUpButtonHandler];
[dialog setAccessoryView:accessoryView]; [dialog setAccessoryView:accessoryView];
} }