github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-16 14:16:09 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: repo diff fixes

Browse source
This commit is contained in:
Mirek Fidler 2023-10-18 11:25:15 +02:00
parent bf9b09b8af
commit 4e28164ebf
5 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uppsrc/TextDiffCtrl/DiffCtrl.cpp
View file

@ -217,16 +217,15 @@ bool HasCrs(const String& path)
void DiffDlg::Write()
{
revert.Enable();
if(diff.right.IsSelection()) {
SaveFile(editfile, diff.Merge(true, HasCrs(editfile)));
Refresh();
revert.Enable();
return;
}
if(PromptYesNo("Do you want to overwrite&[* " + DeQtf(editfile) + "] ?")) {
SaveFile(editfile, extfile);
Break(IDOK);
revert.Enable();
Close();
}
}