diff --git a/ShareX.UploadersLib/BaseUploaders/Uploader.cs b/ShareX.UploadersLib/BaseUploaders/Uploader.cs index 121040df7..3768df445 100644 --- a/ShareX.UploadersLib/BaseUploaders/Uploader.cs +++ b/ShareX.UploadersLib/BaseUploaders/Uploader.cs @@ -62,10 +62,7 @@ public static void UpdateServicePointManager() protected void OnProgressChanged(ProgressManager progress) { - if (ProgressChanged != null) - { - ProgressChanged(progress); - } + ProgressChanged?.Invoke(progress); } protected void OnEarlyURLCopyRequested(string url) diff --git a/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs b/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs index 70554090c..80207dd4f 100644 --- a/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs +++ b/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs @@ -260,17 +260,17 @@ public void ParseResponse(UploadResult result, ResponseInfo responseInfo, Custom { result.ResponseInfo = responseInfo; + if (responseInfo.ResponseText == null) + { + responseInfo.ResponseText = ""; + } + + CustomUploaderParser parser = new CustomUploaderParser(responseInfo, RegexList); + parser.Filename = input.Filename; + parser.URLEncode = true; + if (responseInfo.IsSuccess) { - if (responseInfo.ResponseText == null) - { - responseInfo.ResponseText = ""; - } - - CustomUploaderParser parser = new CustomUploaderParser(responseInfo, RegexList); - parser.Filename = input.Filename; - parser.URLEncode = true; - string url; if (!string.IsNullOrEmpty(URL)) @@ -294,6 +294,14 @@ public void ParseResponse(UploadResult result, ResponseInfo responseInfo, Custom result.ThumbnailURL = parser.Parse(ThumbnailURL); result.DeletionURL = parser.Parse(DeletionURL); } + else + { + if (!string.IsNullOrEmpty(ErrorMessage)) + { + string errorMessage = "Error message:\r\n" + parser.Parse(ErrorMessage); + result.Errors.Add(errorMessage); + } + } } }