Merge pull request #4531 from vector-im/doug/fix_macos_apple_silicon

Fix crash when running on macOS with Apple Silicon.
This commit is contained in:
Doug 2021-07-06 11:10:47 +01:00 committed by GitHub
commit 8e35121d8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View file

@ -10,6 +10,7 @@ Changes to be released in next version
🐛 Bugfix
* VoIP: Do not present ended calls.
* More fixes to Main.storyboard layout on iPhone 12 Pro Max (#4527)
* Fix crash on Apple Silicon Macs.
⚠️ API Changes
*

View file

@ -351,6 +351,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
NSURL *messageSoundURL = [[NSBundle mainBundle] URLForResource:@"message" withExtension:@"caf"];
AudioServicesCreateSystemSoundID((__bridge CFURLRef)messageSoundURL, &_messageSound);
// Set app info now as Mac (Designed for iPad) accesses it before didFinishLaunching is called
self.appInfo = AppInfo.current;
MXLogDebug(@"[AppDelegate] willFinishLaunchingWithOptions: Done");
return YES;
@ -371,8 +374,6 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
_configuration = [AppConfiguration new];
self.appInfo = AppInfo.current;
// Log app information
NSString *appDisplayName = self.appInfo.displayName;
NSString* appVersion = self.appVersion;