Changes related to loading .sif files containing mnemonic attributes for Composite...

[synfig.git] / synfig-core / trunk / src / modules / mod_magickpp / trgt_magickpp.cpp

diff --git a/synfig-core/trunk/src/modules/mod_magickpp/trgt_magickpp.cpp b/synfig-core/trunk/src/modules/mod_magickpp/trgt_magickpp.cpp
index 01925cd..e6da708 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_magickpp/trgt_magickpp.cpp
+++ b/synfig-core/trunk/src/modules/mod_magickpp/trgt_magickpp.cpp
@@ -69,18 +69,18 @@ MagickLib::Image* copy_image_list(Container& container)
                try
                {
                        current = CloneImage(iter->image(), 0, 0, Magick::MagickTrue, &exceptionInfo);
+
+                       if (!first) first = current;
+
+                       current->previous = previous;
+                       current->next     = 0;
+
+                       if ( previous != 0) previous->next = current;
+                       previous = current;
                }
                catch(Magick::Warning warning) {
                        synfig::warning("exception '%s'", warning.what());
                }
-                       
-               if (!first) first = current;
-
-               current->previous = previous;
-               current->next     = 0;
-
-               if ( previous != 0) previous->next = current;
-               previous = current;
        }
 
        return first;
@@ -186,7 +186,7 @@ magickpp_trgt::~magickpp_trgt()
                        filename = (filename_sans_extension(filename) + ".%04d" + filename_extension(filename));
                }
 
-               synfig::info("writing %d images to %s", images.size(), filename.c_str());
+               synfig::info("writing %d image%s to %s", images.size(), images.size() == 1 ? "" : "s", filename.c_str());
                try
                {
                        Magick::writeImages(images.begin(), images.end(), filename);