Fixed NRE

Fixed null reference exception and subsequent crash that happens for some people.
Jdbye · Nov 19, 2021 · fdd562c · fdd562c
1 parent fb70e60
commit fdd562c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/AdvancedInvites/AdvancedInviteSystem.cs b/AdvancedInvites/AdvancedInviteSystem.cs
@@ -210,7 +210,7 @@ private static IntPtr AddNotificationPatch(IntPtr instancePtr, IntPtr notificati
             catch { }
 #endif
 
-            if (!HandledNotifications.Contains(notification.id))
+            if (notification.id != null && !HandledNotifications.Contains(notification.id))
             {
                 HandledNotifications.Add(notification.id);
                 HandleNotification(ref notification);
@@ -227,7 +227,7 @@ private static void HandleNotification(ref Notification notification)
             if (Utilities.CurrentRoom() == null
                 || Utilities.CurrentWorldInstance() == null) return;
 
-            switch (notification.notificationType.ToLowerInvariant())
+            if (notification.notificationType != null) switch (notification.notificationType.ToLowerInvariant())
             {
                 case "invite":
 #if DEBUG
@@ -348,7 +348,7 @@ private static void AcceptNotificationPatch(IntPtr thisPtr, IntPtr notificationP
                 catch { }
 #endif
 
-                if (notification.notificationType.Equals("invite", StringComparison.OrdinalIgnoreCase))
+                if (notification.notificationType != null && notification.notificationType.Equals("invite", StringComparison.OrdinalIgnoreCase))
                 {
                     InviteHandler.HandleInvite(notification);
                     return;

diff --git a/AdvancedInvites/BuildInfo.cs b/AdvancedInvites/BuildInfo.cs
@@ -42,7 +42,8 @@ public static class BuildInfo
         // 1.6.7 Updated for build 1128, fixed sound loading issue, delete works again
         // 1.6.8 Updated for VRC build 1149
         // 1.6.9 Updated for VRC build 1151
-        public const string Version = "1.6.9";
+        // 1.6.10 Hopefully fixed NRE
+        public const string Version = "1.6.10";
 
     }