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

Revert "fix: Drop support for OS X Mavericks (version 10.9)"

Browse source
This commit is contained in:
Samuel Attard 2018-06-20 19:34:04 +10:00 • committed by Electron Bot
parent d2508faea8
commit b0f6c3ab65
15 changed files with 290 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/browser_mac.mm
View file

@ -147,9 +147,13 @@ void Browser::SetUserActivity(const std::string& type,
}
std::string Browser::GetCurrentActivityType() {
NSUserActivity* userActivity =
[[AtomApplication sharedApplication] getCurrentActivity];
return base::SysNSStringToUTF8(userActivity.activityType);
if (@available(macOS 10.10, *)) {
NSUserActivity* userActivity =
[[AtomApplication sharedApplication] getCurrentActivity];
return base::SysNSStringToUTF8(userActivity.activityType);
} else {
return std::string();
}
}
void Browser::InvalidateCurrentActivity() {