Manually diffing Custom BG

[Jayz]

Hello, I've manually applied a diff patch here in this part. I'm not sure if it's correct, please correct me if necessary.

Here's the diff patch that I applied.

-    if( (g = sd->guild) == NULL )
+    if (sd->bg_id)
+        g = bg_guild_get(sd->bg_id);
+    else
+        g = sd->guild;
+    if (g == NULL)

This is from the latest rAthena Files.

auto &g = sd->guild;
if (!g)

This is what I did. If there are any mistakes, please correct me. Thank you very much.

auto &g = (sd->bg_id) ? bg_guild_get(sd->bg_id) : sd->guild;
if (!g)