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

Use scoped_nsobject to ensure our intermediate objects get cleaned up.

Browse source
This commit is contained in:
Charlie Hess 2016-05-04 11:28:49 -07:00
parent 7b207aa1b6
commit b2fb95f857
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/browser_mac.mm
View file

@ -91,16 +91,16 @@ void Browser::SetUserActivity(const std::string& type, const std::map<std::strin
NSString* type_ns = [NSString stringWithUTF8String:type.c_str()];
NSUserActivity* user_activity = [[NSUserActivity alloc] initWithActivityType:type_ns];
NSMutableDictionary* user_info_args = [[NSMutableDictionary alloc] init];
base::scoped_nsobject<NSMutableDictionary> user_info_args([[NSMutableDictionary alloc] init]);
for (auto const &pair : user_info) {
NSString* value_ns = [NSString stringWithUTF8String:pair.second.c_str()];
NSString* key_ns = [NSString stringWithUTF8String:pair.first.c_str()];
[user_info_args setObject:value_ns
forKey:key_ns];
[user_info_args.get() setObject:value_ns
forKey:key_ns];
}
user_activity.userInfo = user_info_args;
user_activity.userInfo = user_info_args.get();
[user_activity becomeCurrent];
[[AtomApplication sharedApplication] setCurrentActivity:user_activity];