mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[storage] no need to mark as failed diff scheme on cancel

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-01-16 12:59:59 +03:00 • committed by Daria Volvenkova
parent 75f4658029
commit f82ec33ed7
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
generator/mwm_diff/diff.cpp
View file

@ -143,22 +143,24 @@ DiffApplicationResult ApplyDiff(string const & oldMwmPath, string const & newMwm
switch (version)
{
case VERSION_V0: return ApplyDiffVersion0(oldReader, newWriter, diffFileSource, cancellable);
default: LOG(LERROR, ("Unknown version format of mwm diff:", version));
case VERSION_V0:
return ApplyDiffVersion0(oldReader, newWriter, diffFileSource, cancellable);
default:
LOG(LERROR, ("Unknown version format of mwm diff:", version));
return DiffApplicationResult::Failed;
}
}
catch (Reader::Exception const & e)
{
LOG(LERROR, ("Could not open file for reading when applying a patch:", e.Msg()));
return DiffApplicationResult::Failed;
}
catch (Writer::Exception const & e)
{
LOG(LERROR, ("Could not open file for writing when applying a patch:", e.Msg()));
return DiffApplicationResult::Failed;
}
return DiffApplicationResult::Failed;
return cancellable.IsCancelled() ? DiffApplicationResult::Cancelled
: DiffApplicationResult::Failed;
}
string DebugPrint(DiffApplicationResult const & result)