fix fix of bug 2192

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13317 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index 00ec15395cf8d20677b8cf69f45c848f95836cf3..40802379826c847e4b1657b3cebc3367531f9451 100644 (file)
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-17  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * GraphicsCacheItem.C (findTargetFormat): fix previous fix
+
 2006-01-11  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * GraphicsCacheItem.C (convertToDisplayFormat): handle unknown

diff --git a/src/graphics/GraphicsCacheItem.C b/src/graphics/GraphicsCacheItem.C
index 4c11ed6b9871ac4ff70273d5c13171c642f45387..ee9441d125911d73b6c040cba0e88a9236904d5f 100644 (file)
--- a/src/graphics/GraphicsCacheItem.C
+++ b/src/graphics/GraphicsCacheItem.C
@@ -335,9 +335,12 @@ string const findTargetFormat(string const & from)
        typedef lyx::graphics::Image::FormatList FormatList;
        FormatList const formats = lyx::graphics::Image::loadableFormats();
 
+        // There must be a format to load from.
+       BOOST_ASSERT(!formats.empty());
+
        // Use the standard converter if we don't know the format to load
        // from.
-       if (!formats.empty())
+       if (from.empty())
                return string("ppm");
 
        // First ascertain if we can load directly with no conversion