Typo.

[synfig.git] / synfig-core / trunk / src / synfig / canvas.cpp

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index 6875155..dcb702f 100644 (file)
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -2,7 +2,7 @@
 /*!    \file canvas.cpp
 **     \brief Canvas Class Member Definitions
 **
-**     $Id: canvas.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -510,7 +510,7 @@ Canvas::surefind_canvas(const String &id)
                if(id[0]=='#')
                        return surefind_canvas(String(id,1));
 
-               //! \todo This needs alot more optimization
+               //! \todo This needs a lot more optimization
                String file_name(id,0,id.find_first_of('#'));
                String external_id(id,id.find_first_of('#')+1);
 
@@ -595,7 +595,7 @@ Canvas::find_canvas(const String &id)const
                if(id[0]=='#')
                        return find_canvas(String(id,1));
 
-               //! \todo This needs alot more optimization
+               //! \todo This needs a lot more optimization
                String file_name(id,0,id.find_first_of('#'));
                String external_id(id,id.find_first_of('#')+1);
 
@@ -1039,7 +1039,9 @@ synfig::optimize_layers(Context context, Canvas::Handle op_canvas)
                if(layer->get_name()=="PasteCanvas" && paste_canvas->get_time_offset()==0)
                {
                        Canvas::Handle sub_canvas(Canvas::create_inline(op_canvas));
-                       optimize_layers(paste_canvas->get_sub_canvas()->get_context(),sub_canvas);
+                       Canvas::Handle paste_sub_canvas = paste_canvas->get_sub_canvas();
+                       if(paste_sub_canvas)
+                               optimize_layers(paste_sub_canvas->get_context(),sub_canvas);
 //#define SYNFIG_OPTIMIZE_PASTE_CANVAS 1
 
 #ifdef SYNFIG_OPTIMIZE_PASTE_CANVAS