anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 14:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Richard Kimberly Heck 2021-04-03 17:58:46 -04:00
parent 7a6ad48495
commit eb2e8e1579
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Buffer.cpp
View File

@ -4770,17 +4770,18 @@ Buffer::ReadStatus Buffer::loadEmergency()
}
case 2: {
string f1 = d->filename.absFileName();
string f2 = emergencyFile.absFileName();
string const f1 = d->filename.absFileName();
string const f2 = emergencyFile.absFileName();
if (loadThisLyXFile(d->filename) != ReadSuccess)
return ReadCancel;
string par = "compare run-blocking " + quoteName(f1) + " " + quoteName(f2);
string const par = "compare run-blocking " + quoteName(f1) + " " + quoteName(f2);
LYXERR(Debug::FILES, par << "\n");
lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, par));
//release the emergency buffer loaded by compare
Buffer * emerBuffer = theBufferList().getBuffer(emergencyFile);
if (emerBuffer) theBufferList().release(emerBuffer);
if (emerBuffer)
theBufferList().release(emerBuffer);
return ReadCancel; //Release the buffer of Original immediatelly
}