From e0ba773e78db767b857e3176731879632b3f5632 Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Sat, 27 Jun 2020 15:27:00 +0200
Subject: [PATCH] Make GetFirstSteamMasterID() fall back to SteamOwnerID in
 case no master users are specified

---
 ArchiSteamFarm/Actions.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ArchiSteamFarm/Actions.cs b/ArchiSteamFarm/Actions.cs
index a7f85ce09..8285c9917 100644
--- a/ArchiSteamFarm/Actions.cs
+++ b/ArchiSteamFarm/Actions.cs
@@ -434,7 +434,11 @@ namespace ArchiSteamFarm {
 
 		internal void OnDisconnected() => HandledGifts.Clear();
 
-		private ulong GetFirstSteamMasterID() => Bot.BotConfig.SteamUserPermissions.Where(kv => (kv.Key != 0) && (kv.Value == BotConfig.EPermission.Master)).Select(kv => kv.Key).OrderByDescending(steamID => steamID != Bot.SteamID).ThenBy(steamID => steamID).FirstOrDefault();
+		private ulong GetFirstSteamMasterID() {
+			ulong steamMasterID = Bot.BotConfig.SteamUserPermissions.Where(kv => (kv.Key != 0) && (kv.Key != Bot.SteamID) && new SteamID(kv.Key).IsIndividualAccount && (kv.Value == BotConfig.EPermission.Master)).Select(kv => kv.Key).OrderBy(steamID => steamID).FirstOrDefault();
+
+			return steamMasterID > 0 ? steamMasterID : (ASF.GlobalConfig.SteamOwnerID != 0) && new SteamID(ASF.GlobalConfig.SteamOwnerID).IsIndividualAccount ? ASF.GlobalConfig.SteamOwnerID : 0;
+		}
 
 		private static async Task LimitGiftsRequestsAsync() {
 			if (ASF.GiftsSemaphore == null) {