#841 Завершил создание ошибок в рантайме

vknet · Aug 5, 2019 · 64195cf · 64195cf
1 parent 97a7cf1
commit 64195cf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/VkNet/Utils/ExecuteErrorsHandler.cs b/VkNet/Utils/ExecuteErrorsHandler.cs
@@ -37,8 +37,7 @@ public static AggregateException GetExecuteExceptions(string response)
 					ErrorMessage = exception.ErrorMessage,
 					Method = exception.Method,
 					RequestParams = exception.RequestParams
-				}))
-				.ToList();
+				}));
 
 			return new AggregateException(exceptionList);
 		}

diff --git a/VkNet/Utils/VkErrors.cs b/VkNet/Utils/VkErrors.cs
@@ -139,9 +139,11 @@ private static Tuple<string, T> ThrowIfNumberIsNegative<T>(Expression<T> expr)
 		/// </exception>
 		public static void IfErrorThrowException(string json)
 		{
+			JObject obj;
+
 			try
 			{
-				JObject.Parse(json);
+				obj = JObject.Parse(json);
 			}
 			catch (JsonReaderException ex)
 			{
@@ -155,7 +157,12 @@ public static void IfErrorThrowException(string json)
 				throw exceptions;
 			}
 
-			var vkError = JsonConvert.DeserializeObject<VkError>(json);
+			if (!obj.TryGetValue("error", StringComparison.InvariantCulture, out var error))
+			{
+				return;
+			}
+
+			var vkError = JsonConvert.DeserializeObject<VkError>(error.ToString());
 
 			if (vkError == null || vkError.ErrorCode == 0)
 			{