X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=93381d495adf024a907ab9eb65f418465d1b8440;hb=8a099cbbc834f7d2eaa019c1af55c1cf1ecfc21d;hp=cbaed033d8631b5eb5f920de8faabf3590f38941;hpb=c3ad95144d148602f672e95ddda1f18fc35502f8;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index cbaed03..93381d4 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -1718,7 +1718,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 +2146,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 +2626,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()));
@@ -2821,7 +2821,9 @@ CanvasView::play()
 		if(!work_area->sync_render_preview())
 			break;
 
-		studio::App::iteration(false);
+		// wait for the workarea to refresh itself
+		while (studio::App::events_pending())
+			studio::App::iteration(false);
 
 		if(get_cancel_status())
 			return;
@@ -3042,7 +3044,7 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& con
 			if(!get_instance()->perform_action(action))
 				break;
 
-			// Ok, we have successfuly imported at least one item.
+			// Ok, we have successfully imported at least one item.
 			success=true;
 		} while(0); // END of "STRING"