cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-27 01:22:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix auto save ui interactions

Browse Source 
#202
This commit is contained in:
Ben Olden-Cooligan 2023-10-08 18:20:09 -07:00
parent f50837b22f
commit 0d1ae59e3e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
NAPS2.Lib/ImportExport/AutoSaver.cs
View File

@ -117,10 +117,13 @@ public class AutoSaver
string subPath = placeholders.Substitute(settings.FilePath, true, i);
if (settings.PromptForFilePath)
{
if (_dialogHelper.PromptToSavePdfOrImage(subPath, out string? newPath))
Invoker.Current.Invoke(() =>
{
subPath = placeholders.Substitute(newPath!, true, i);
}
if (_dialogHelper.PromptToSavePdfOrImage(subPath, out string? newPath))
{
subPath = placeholders.Substitute(newPath!, true, i);
}
});
}
// TODO: This placeholder handling is complex and wrong in some cases (e.g. FilePerScan with ext = "jpg")
// TODO: Maybe have initial placeholders that replace date, then rely on the ops to increment the file num
@ -139,7 +142,7 @@ public class AutoSaver
bool success = await op.Success;
if (success && doNotify)
{
_notify.PdfSaved(subPath);
Invoker.Current.Invoke(() => _notify.PdfSaved(subPath));
}
return (success, subPath);
}
@ -153,7 +156,7 @@ public class AutoSaver
bool success = await op.Success;
if (success && doNotify && op.FirstFileSaved != null)
{
_notify.ImagesSaved(images.Count, op.FirstFileSaved);
Invoker.Current.Invoke(() => _notify.ImagesSaved(images.Count, op.FirstFileSaved));
}
return (success, subPath);
}