7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 19:15:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

make file picker dialog cancellation not return an error but just cancel the task

Browse source
This commit is contained in:
HJfod 2024-08-24 11:26:28 +03:00
parent 766b71dfbd
commit 971e3fb254
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
loader/src/platform/windows/util.cpp
View file

@ -123,11 +123,13 @@ Task<Result<std::filesystem::path>> file::pick(PickMode mode, FilePickOptions co
Result<std::filesystem::path> result; Result<std::filesystem::path> result;
auto pickresult = nfdPick(nfdMode, options, &path); auto pickresult = nfdPick(nfdMode, options, &path);
if (pickresult.isErr()) { if (pickresult.isErr()) {
result = Err(pickresult.err().value()); if (pickresult.unwrapErr() == "Dialog cancelled") {
return RetTask::cancelled();
}
return RetTask::immediate(Err(pickresult.unwrapErr()));
} else { } else {
result = Ok(path); return RetTask::immediate(Ok(path));
} }
return RetTask::immediate(std::move(result));
} }
Task<Result<std::vector<std::filesystem::path>>> file::pickMany(FilePickOptions const& options) { Task<Result<std::vector<std::filesystem::path>>> file::pickMany(FilePickOptions const& options) {