On Tuesday 04 March 2003 10:20 am, Jean-Marc Lasgouttes wrote: > >>>>> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: > > Angus> Ok to apply to 1.3.x Jean-Marc? > > >> Yes. > > Angus> Will do. Angus > > You did not forget about it, did you?
Hmmm. Looks like I forgot to commit it. Here it is.
Index: status.13x =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/Attic/status.13x,v retrieving revision 1.1.2.42 diff -u -p -r1.1.2.42 status.13x --- status.13x 3 Mar 2003 20:02:59 -0000 1.1.2.42 +++ status.13x 4 Mar 2003 10:29:11 -0000 @@ -123,3 +123,16 @@ What's new - improve the lyx.spec file used to produce rpms - fix a lyx2lyx bug that rejected csv2lyx files as bad formed + +- enable the lyx2lyx debug level to be set + +- squash a potential bug in the PreviewLoader before it bites. + +- don't cause a warning message to complain about starting an already running + timer. Just don't start it ;-) + +- prevent incorrect warning message about failing to find a graphics file to + load when all is actually fine and dandy. + +- prevent a crash when generating previews if the user is not using a tmp + directory. Index: src/graphics/ChangeLog =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/ChangeLog,v retrieving revision 1.139.2.2 diff -u -p -r1.139.2.2 ChangeLog --- src/graphics/ChangeLog 25 Feb 2003 17:03:27 -0000 1.139.2.2 +++ src/graphics/ChangeLog 4 Mar 2003 10:29:11 -0000 @@ -1,3 +1,8 @@ +2003-02-26 Angus Leeming <[EMAIL PROTECTED]> + + * PreviewLoader.C (startLoading): Prevent a crash if the user is + not using a tmp directory. + 2003-02-25 Alfredo Braunstein <[EMAIL PROTECTED]> * GraphicsCacheItem.C (imageConverted): move warning inside the Index: src/graphics/PreviewLoader.C =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/PreviewLoader.C,v retrieving revision 1.37.2.1 diff -u -p -r1.37.2.1 PreviewLoader.C --- src/graphics/PreviewLoader.C 25 Feb 2003 16:40:03 -0000 1.37.2.1 +++ src/graphics/PreviewLoader.C 4 Mar 2003 10:29:12 -0000 @@ -453,7 +453,11 @@ void PreviewLoader::Impl::startLoading() lyxerr[Debug::GRAPHICS] << "PreviewLoader::startLoading()" << endl; // As used by the LaTeX file and by the resulting image files - string const filename_base(unique_filename(buffer_.tmppath)); + string directory = buffer_.tmppath; + if (directory.empty()) + directory = buffer_.filePath(); + + string const filename_base(unique_filename(directory)); // Create an InProgress instance to place in the map of all // such processes if it starts correctly.
