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

Avoids deadlock in case NSUserActivityDelegate method start being called from main thread.

Browse source
This commit is contained in:
Rafael Nobre 2017-08-09 14:28:43 -03:00 committed by Cheng Zhao
parent 9483f0fc14
commit 77a1c5d7fc
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/mac/atom_application.mm
View file

@ -10,6 +10,14 @@
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "content/public/browser/browser_accessibility_state.h" #include "content/public/browser/browser_accessibility_state.h"
static inline void dispatch_sync_main(dispatch_block_t block) {
if ([NSThread isMainThread]) {
block();
} else {
dispatch_sync(dispatch_get_main_queue(), block);
}
}
@implementation AtomApplication @implementation AtomApplication
+ (AtomApplication*)sharedApplication { + (AtomApplication*)sharedApplication {
@ -68,7 +76,7 @@
__block BOOL shouldWait = NO; __block BOOL shouldWait = NO;
dispatch_sync(dispatch_get_main_queue(), ^{ dispatch_sync_main(^{
std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType)); std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
std::unique_ptr<base::DictionaryValue> user_info = std::unique_ptr<base::DictionaryValue> user_info =
atom::NSDictionaryToDictionaryValue(userActivity.userInfo); atom::NSDictionaryToDictionaryValue(userActivity.userInfo);