mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-23 13:31:49 +00:00
Polish
This commit is contained in:
parent
7a6ad48495
commit
eb2e8e1579
@ -4770,17 +4770,18 @@ Buffer::ReadStatus Buffer::loadEmergency()
|
|||||||
}
|
}
|
||||||
|
|
||||||
case 2: {
|
case 2: {
|
||||||
string f1 = d->filename.absFileName();
|
string const f1 = d->filename.absFileName();
|
||||||
string f2 = emergencyFile.absFileName();
|
string const f2 = emergencyFile.absFileName();
|
||||||
if (loadThisLyXFile(d->filename) != ReadSuccess)
|
if (loadThisLyXFile(d->filename) != ReadSuccess)
|
||||||
return ReadCancel;
|
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");
|
LYXERR(Debug::FILES, par << "\n");
|
||||||
lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, par));
|
lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, par));
|
||||||
|
|
||||||
//release the emergency buffer loaded by compare
|
//release the emergency buffer loaded by compare
|
||||||
Buffer * emerBuffer = theBufferList().getBuffer(emergencyFile);
|
Buffer * emerBuffer = theBufferList().getBuffer(emergencyFile);
|
||||||
if (emerBuffer) theBufferList().release(emerBuffer);
|
if (emerBuffer)
|
||||||
|
theBufferList().release(emerBuffer);
|
||||||
|
|
||||||
return ReadCancel; //Release the buffer of Original immediatelly
|
return ReadCancel; //Release the buffer of Original immediatelly
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user