X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=718a90b10f199d9b6911595c793ebeebe0a570b1;hb=681ba239b16079acc1bd2eebb7e1d7c24927ba50;hp=15608e911dbf5716b559ce8c38061daf85d54f5b;hpb=b9f0f0c6a31cc9c651469d2f0195cba8af04f8e5;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 15608e9..718a90b 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -796,6 +796,13 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
 	int h=get_canvas()->rend_desc().get_h()+70;
 	while(w>700 || h>600)
 	{
+		// Minor hack:
+		//   zoom_out() =>
+		//	   WorkArea::async_update_preview() =>
+		//	     WorkArea::set_zoom(float) =>
+		//		   WorkArea::async_update_preview() =>
+		//			 desc.set_time(cur_time), where cur_time isn't initialised
+		work_area->set_time(0);
 		work_area->zoom_out();
 		w=round_to_int(get_canvas()->rend_desc().get_w()*work_area->get_zoom()+70);
 		h=round_to_int(get_canvas()->rend_desc().get_h()*work_area->get_zoom()+70);
@@ -905,6 +912,10 @@ CanvasView::~CanvasView()
 
 	hide();
 
+	// don't be calling on_dirty_preview once this object has been deleted;
+	// this was causing a crash before
+	canvas_interface()->signal_dirty_preview().clear();
+
 	synfig::info("CanvasView:~CanvasView(): Destructor Finished");
 }
 
@@ -1718,7 +1729,7 @@ CanvasView::popup_layer_menu(synfig::Layer::Handle layer)
 
 	//parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("New Layer"),*newlayers));
 
-	if(layer->get_name()=="paste_canvas")
+	if(layer->get_name()=="PasteCanvas")
 	{
 		menu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Select All Children"),
 			sigc::bind(
@@ -2146,7 +2157,7 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::Col
 				build_new_layer_menu(*newlayers);
 
 				parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem("New Layer",*newlayers));
-				if(!multiple_selected && layer->get_name()=="paste_canvas")
+				if(!multiple_selected && layer->get_name()=="PasteCanvas")
 				{
 					parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Select All Children"),
 						sigc::bind(
@@ -2626,7 +2637,7 @@ CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, Canvas
 
 		// If this is a paste canvas layer, then we need to
 		// descend into it
-		if(layer_name=="paste_canvas")
+		if(layer_name=="PasteCanvas")
 		{
 			Vector scale;
 			scale[0]=scale[1]=exp(layer->get_param("zoom").get(Real()));