mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-29 07:42:40 +00:00
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:
commit
8e35121d8f
2 changed files with 4 additions and 2 deletions
|
@ -10,6 +10,7 @@ Changes to be released in next version
|
||||||
🐛 Bugfix
|
🐛 Bugfix
|
||||||
* VoIP: Do not present ended calls.
|
* VoIP: Do not present ended calls.
|
||||||
* More fixes to Main.storyboard layout on iPhone 12 Pro Max (#4527)
|
* More fixes to Main.storyboard layout on iPhone 12 Pro Max (#4527)
|
||||||
|
* Fix crash on Apple Silicon Macs.
|
||||||
|
|
||||||
⚠️ API Changes
|
⚠️ API Changes
|
||||||
*
|
*
|
||||||
|
|
|
@ -351,6 +351,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
|
||||||
NSURL *messageSoundURL = [[NSBundle mainBundle] URLForResource:@"message" withExtension:@"caf"];
|
NSURL *messageSoundURL = [[NSBundle mainBundle] URLForResource:@"message" withExtension:@"caf"];
|
||||||
AudioServicesCreateSystemSoundID((__bridge CFURLRef)messageSoundURL, &_messageSound);
|
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");
|
MXLogDebug(@"[AppDelegate] willFinishLaunchingWithOptions: Done");
|
||||||
|
|
||||||
return YES;
|
return YES;
|
||||||
|
@ -371,8 +374,6 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
|
||||||
|
|
||||||
_configuration = [AppConfiguration new];
|
_configuration = [AppConfiguration new];
|
||||||
|
|
||||||
self.appInfo = AppInfo.current;
|
|
||||||
|
|
||||||
// Log app information
|
// Log app information
|
||||||
NSString *appDisplayName = self.appInfo.displayName;
|
NSString *appDisplayName = self.appInfo.displayName;
|
||||||
NSString* appVersion = self.appVersion;
|
NSString* appVersion = self.appVersion;
|
||||||
|
|
Loading…
Reference in a new issue