anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 06:19:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix crash bug with non-existing input files

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3360 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-01-13 21:35:50 +00:00
parent 836d40440f
commit 1d99b34719
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ChangeLog
View File

@ -1,5 +1,8 @@
2002-01-13 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* bufferlist.C (readFile): create the buffer _after_ checking that
the file exists.
* lyxfunc.C (verboseDispatch): fix handling of arguments
* lyxrc.C (setDefaults): do not initialize document_path to $HOME.

4
src/bufferlist.C
View File

@ -357,8 +357,6 @@ void BufferList::emergencyWrite(Buffer * buf)
Buffer * BufferList::readFile(string const & s, bool ronly)
{
Buffer * b = bstore.newBuffer(s, ronly);
string ts(s);
string e = OnlyPath(s);
string a = e;
@ -371,6 +369,8 @@ Buffer * BufferList::readFile(string const & s, bool ronly)
return 0;
}
Buffer * b = bstore.newBuffer(s, ronly);
// Check if emergency save file exists and is newer.
e += OnlyFilename(s) + ".emergency";
FileInfo fileInfoE(e);

3
src/insets/ChangeLog
View File

@ -1,5 +1,8 @@
2002-01-13 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* insetinclude.C (loadIfNeeded): do not call bufferlist.readFile
if file does not exist
* figinset.C (browseFile): add shortcuts to directory buttons
* insettext.C (updateLocal): update menubar and toolbar here too.

6
src/insets/insetinclude.C
View File

@ -218,8 +218,10 @@ bool InsetInclude::loadIfNeeded() const
// the readonly flag can/will be wrong, not anymore I think.
FileInfo finfo(getFileName());
bool const ro = !(!finfo.isOK() || finfo.writable());
return bufferlist.readFile(getFileName(), ro) != 0;
if (!finfo.isOK())
return false;
return bufferlist.readFile(getFileName(), !finfo.writable()) != 0;
}