Merge branch 'develop' into doug/4515_fix_video_thumbnail_orientation

element-hq · Jul 6, 2021 · 37472cd · 37472cd
2 parents 4921d6d + 8e35121
commit 37472cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -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.
  * Media Picker: Generate video thumbnails with the correct orientation (#4515).
 
 ⚠️ API Changes

diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -351,6 +351,9 @@ - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:
     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 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     _configuration = [AppConfiguration new];
 
-    self.appInfo = AppInfo.current;
-
     // Log app information
     NSString *appDisplayName = self.appInfo.displayName;
     NSString* appVersion = self.appVersion;