diff --git a/ArcdpsLogManager/Controls/MultipleLogPanel.cs b/ArcdpsLogManager/Controls/MultipleLogPanel.cs index 2183d969..8afeec9d 100644 --- a/ArcdpsLogManager/Controls/MultipleLogPanel.cs +++ b/ArcdpsLogManager/Controls/MultipleLogPanel.cs @@ -106,11 +106,12 @@ private void UpdateDpsReportUploadStatus() int finished = uploaded + uploadsFailed + processingFailed; int totalRequested = queued + uploading + uploaded + uploadsFailed + processingFailed; + int missingUploads = notUploaded + uploadsFailed + processingFailed; dpsReportUploadProgressBar.MaxValue = totalRequested > 0 ? totalRequested : 1; dpsReportUploadProgressBar.Value = finished; - dpsReportUploadButton.Enabled = notUploaded + uploadsFailed + processingFailed > 0; + dpsReportUploadButton.Enabled = missingUploads > 0; dpsReportCancelButton.Enabled = queued > 0; - dpsReportUploadButton.Text = $"Upload missing logs ({notUploaded + uploadsFailed})"; + dpsReportUploadButton.Text = $"Upload missing logs ({missingUploads})"; dpsReportNotUploadedLabel.Text = notUploaded.ToString(); dpsReportUploadingLabel.Text = (uploading + queued).ToString(); dpsReportUploadedLabel.Text = uploaded.ToString(); @@ -154,7 +155,7 @@ public MultipleLogPanel(LogCache logCache, ApiData apiData, LogDataProcessor log foreach (var log in logData) { var state = log.DpsReportEIUpload.UploadState; - if (state == UploadState.NotUploaded || state == UploadState.UploadError) + if (state is UploadState.NotUploaded or UploadState.UploadError or UploadState.ProcessingError) { uploadProcessor.ScheduleDpsReportEIUpload(log); }