I still think it would be great to get rid of reference counting - read the new comme...

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

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index 04ed8b9..edc3d0b 100644 (file)
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@ -85,7 +85,8 @@ Layer_PasteCanvas::Layer_PasteCanvas():
        origin(0,0),
        depth(0),
        zoom(0),
-       time_offset(0)
+       time_offset(0),
+       extra_reference(false)
 {
        children_lock=false;
        muck_with_time_=true;
@@ -103,6 +104,7 @@ Layer_PasteCanvas::~Layer_PasteCanvas()
        set_sub_canvas(0);
 
        //if(canvas && (canvas->is_inline() || !get_canvas() || get_canvas()->get_root()!=canvas->get_root()))
+       //if(extra_reference)
        //      canvas->unref();
 }
 
@@ -186,7 +188,8 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle<synfig::Canvas> x)
        if(canvas && muck_with_time_)
                remove_child(canvas.get());
 
-       if(canvas && (canvas->is_inline() || !get_canvas() || get_canvas()->get_root()!=canvas->get_root()))
+       // if(canvas && (canvas->is_inline() || !get_canvas() || get_canvas()->get_root()!=canvas->get_root()))
+       if (extra_reference)
                canvas->unref();
 
        child_changed_connection.disconnect();
@@ -209,7 +212,12 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle<synfig::Canvas> x)
                add_child(canvas.get());
 
        if(canvas && (canvas->is_inline() || !get_canvas() || get_canvas()->get_root()!=canvas->get_root()))
+       {
                canvas->ref();
+               extra_reference = true;
+       }
+       else
+               extra_reference = false;
 
        if(canvas)
                on_canvas_set();