Fix awaiting null tasks, closes #128

JustArchiNET · Mar 6, 2016 · b9064bb · b9064bb
1 parent eddcc28
commit b9064bb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/ArchiSteamFarm/ArchiHandler.cs b/ArchiSteamFarm/ArchiHandler.cs
@@ -24,9 +24,11 @@ limitations under the License.
 
 using SteamKit2;
 using SteamKit2.Internal;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
+using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
 	internal sealed class ArchiHandler : ClientMsgHandler {
@@ -216,7 +218,7 @@ internal void PlayGames(ICollection<uint> gameIDs) {
 			Client.Send(request);
 		}
 
-		internal AsyncJob<PurchaseResponseCallback> RedeemKey(string key) {
+		internal async Task<PurchaseResponseCallback> RedeemKey(string key) {
 			if (string.IsNullOrEmpty(key) || !Client.IsConnected) {
 				return null;
 			}
@@ -228,7 +230,12 @@ internal AsyncJob<PurchaseResponseCallback> RedeemKey(string key) {
 			request.Body.key = key;
 
 			Client.Send(request);
-			return new AsyncJob<PurchaseResponseCallback>(Client, request.SourceJobID);
+			try {
+				return await new AsyncJob<PurchaseResponseCallback>(Client, request.SourceJobID);
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				return null;
+			}
 		}
 
 		/*

diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
@@ -524,7 +524,7 @@ private async Task<string> ResponseRedeem(string message, bool validate) {
 
 					ArchiHandler.PurchaseResponseCallback result;
 					try {
-						result = await currentBot.ArchiHandler.RedeemKey(key);
+						result = await currentBot.ArchiHandler.RedeemKey(key).ConfigureAwait(false);
 					} catch (Exception e) {
 						Logging.LogGenericException(e, currentBot.BotName);
 						break;
@@ -575,7 +575,7 @@ private async Task<string> ResponseRedeem(string message, bool validate) {
 
 								ArchiHandler.PurchaseResponseCallback otherResult;
 								try {
-									otherResult = await bot.ArchiHandler.RedeemKey(key);
+									otherResult = await bot.ArchiHandler.RedeemKey(key).ConfigureAwait(false);
 								} catch (Exception e) {
 									Logging.LogGenericException(e, bot.BotName);
 									break; // We're done with this key