mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Unfix async Task where it doesn't work.
This commit is contained in:
@@ -679,11 +679,9 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
foreach(MediaTagType mediaTag in _inputFormat.Info.ReadableMediaTags.Where(mediaTag =>
|
||||
!outputFormat.SupportedMediaTags.Contains(mediaTag) && !ForceChecked))
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Converting image will lose media tag {
|
||||
mediaTag
|
||||
}, not continuing...",
|
||||
$"Converting image will lose media tag {mediaTag}, not continuing...",
|
||||
icon: Icon.Error).
|
||||
ShowDialog(_view));
|
||||
|
||||
@@ -705,7 +703,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
continue;
|
||||
}
|
||||
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Converting image will lose sector tag {sectorTag}, not continuing...",
|
||||
icon: Icon.Error).
|
||||
@@ -758,11 +756,9 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
if(!outputFormat.Create(DestinationText, _inputFormat.Info.MediaType, parsedOptions, _inputFormat.Info.Sectors,
|
||||
_inputFormat.Info.SectorSize))
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {outputFormat.
|
||||
ErrorMessage
|
||||
} creating output image.",
|
||||
$"Error {outputFormat.ErrorMessage} creating output image.",
|
||||
icon: Icon.Error).
|
||||
ShowDialog(_view));
|
||||
|
||||
@@ -806,7 +802,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
|
||||
if(ForceChecked != true)
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {outputFormat.ErrorMessage} setting metadata, not continuing...",
|
||||
icon: Icon.Error).
|
||||
@@ -835,7 +831,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
|
||||
if(!outputOptical.SetTracks(tracks))
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {outputFormat.ErrorMessage} sending tracks list to output image.",
|
||||
icon: Icon.Error).
|
||||
@@ -881,7 +877,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
{
|
||||
if(errno == ErrorNumber.NoError)
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() =>
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () =>
|
||||
await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {outputFormat.ErrorMessage} writing media tag, not continuing...",
|
||||
@@ -892,7 +888,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() =>
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () =>
|
||||
await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {errno} reading media tag, not continuing...",
|
||||
@@ -985,7 +981,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {errno} reading sector {doneSectors}, not continuing...",
|
||||
icon: Icon.Error).ShowDialog(_view));
|
||||
@@ -1018,7 +1014,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {errno} reading sector {doneSectors}, not continuing...",
|
||||
icon: Icon.Error).ShowDialog(_view));
|
||||
@@ -1041,7 +1037,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
|
||||
icon: Icon.Error).ShowDialog(_view));
|
||||
@@ -1199,7 +1195,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {errno} reading sector {doneSectors}, not continuing...",
|
||||
icon: Icon.Error).
|
||||
@@ -1251,7 +1247,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {errno} reading sector {doneSectors}, not continuing...",
|
||||
icon: Icon.Error).
|
||||
@@ -1275,7 +1271,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
|
||||
icon: Icon.Error).ShowDialog(_view));
|
||||
@@ -1380,7 +1376,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {errno} reading sector {doneSectors}, not continuing...",
|
||||
icon: Icon.Error).
|
||||
@@ -1414,7 +1410,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {errno} reading sector {doneSectors}, not continuing...",
|
||||
icon: Icon.Error).
|
||||
@@ -1435,7 +1431,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
|
||||
icon: Icon.Error).ShowDialog(_view));
|
||||
@@ -1510,7 +1506,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() =>
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () =>
|
||||
await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {errno} reading tag, not continuing...",
|
||||
@@ -1533,7 +1529,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() =>
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () =>
|
||||
await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {outputFormat.ErrorMessage} writing tag, not continuing...",
|
||||
@@ -1591,7 +1587,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {errno} reading tag for sector {doneSectors}, not continuing...",
|
||||
icon: Icon.Error).
|
||||
@@ -1611,7 +1607,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
}
|
||||
else
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {outputFormat.ErrorMessage} writing tag for sector {doneSectors}, not continuing...",
|
||||
icon: Icon.Error).
|
||||
@@ -1676,7 +1672,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
|
||||
if(_cancel)
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() =>
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () =>
|
||||
{
|
||||
await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error", "Operation canceled, the output file is not correct.",
|
||||
@@ -1692,7 +1688,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
|
||||
if(!outputFormat.Close())
|
||||
{
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() => await MessageBoxManager.
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
|
||||
GetMessageBoxStandardWindow("Error",
|
||||
$"Error {outputFormat.ErrorMessage} closing output image... Contents are not correct.",
|
||||
icon: Icon.Error).
|
||||
@@ -1701,7 +1697,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
|
||||
return;
|
||||
}
|
||||
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async Task() =>
|
||||
await Dispatcher.UIThread.InvokeAsync(action: async () =>
|
||||
{
|
||||
await MessageBoxManager.GetMessageBoxStandardWindow(warning ? "Warning" : "Conversion success",
|
||||
warning
|
||||
|
||||
@@ -38,7 +38,6 @@ using System.Diagnostics.CodeAnalysis;
|
||||
using System.Globalization;
|
||||
using System.Reactive;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Aaru.CommonTypes.Interfaces;
|
||||
using Aaru.Console;
|
||||
using Aaru.Core;
|
||||
@@ -308,7 +307,7 @@ public sealed class ImageEntropyViewModel : ViewModelBase
|
||||
WholeDiscChecked = false;
|
||||
}
|
||||
|
||||
var thread = new Thread(async Task() =>
|
||||
var thread = new Thread(async () =>
|
||||
{
|
||||
if(SeparatedTracksChecked)
|
||||
{
|
||||
|
||||
@@ -576,7 +576,7 @@ public sealed class MediaScanViewModel : ViewModelBase
|
||||
});
|
||||
|
||||
[SuppressMessage("ReSharper", "AsyncVoidMethod")]
|
||||
async void StoppingErrorMessage(string text) => await Dispatcher.UIThread.InvokeAsync(action: async Task() =>
|
||||
async void StoppingErrorMessage(string text) => await Dispatcher.UIThread.InvokeAsync(action: async () =>
|
||||
{
|
||||
ProgressText = text;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user