Merge pull request #196 from RegorForgotTheirPassword/master

Fix of ProcessMessage throwing NullPointerExceptions

Author: Lachee

DiscordRPC/DiscordRpcClient.cs

@@ -300,15 +300,13 @@ private void ProcessMessage(IMessage message)
                         if (pm != null)
                         {
                             //We need to merge these presences together
-                            if (CurrentPresence == null)
-                            {
-                                CurrentPresence = (new RichPresence()).Merge(pm.Presence);
-                            }
-                            else if (pm.Presence == null)
+                            if (pm.Presence == null)
                             {
                                 CurrentPresence = null;
-                            }
-                            else
+                            } else if (CurrentPresence == null)
+                            {
+                                CurrentPresence = (new RichPresence()).Merge(pm.Presence);
+                            } else
                             {
                                 CurrentPresence.Merge(pm.Presence);
                             }