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

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 4b1d351..718a90b 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -553,13 +553,13 @@ public:
 	}
 
 	//! Sets which value_nodes should be selected
-	virtual void set_selected_children(const ChildrenList &children_list)
+	virtual void set_selected_children(const ChildrenList &/*children_list*/)
 	{
 		return;
 	}
 
 	//! Sets which value_node should be selected. Empty handle if none.
-	virtual void set_selected_child(const ChildrenList::value_type &child)
+	virtual void set_selected_child(const ChildrenList::value_type &/*child*/)
 	{
 		return;
 	}
@@ -610,12 +610,12 @@ public:
 		return get_selected_layer_parameters().front();
 	}
 
-	void set_selected_layer_parameters(const LayerParamList &layer_param_list)
+	void set_selected_layer_parameters(const LayerParamList &/*layer_param_list*/)
 	{
 		return;
 	}
 
-	void set_selected_layer_param(const LayerParam &layer_param)
+	void set_selected_layer_param(const LayerParam &/*layer_param*/)
 	{
 		return;
 	}
@@ -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");
 }
 
@@ -1305,7 +1316,7 @@ CanvasView::init_menus()
 		action=Gtk::Action::create("seek-prev-frame", Gtk::Stock::GO_BACK,_("Prev Frame"),_("Prev Frame"));
 		action_group->add( action, sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_frame),-1));
 
-		action=Gtk::Action::create("seek-next-second", Gtk::Stock::GO_FORWARD,_("Seek Foward"),_("Seek Foward"));
+		action=Gtk::Action::create("seek-next-second", Gtk::Stock::GO_FORWARD,_("Seek Forward"),_("Seek Forward"));
 		action_group->add(action,sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_time),Time(1)));
 		action=Gtk::Action::create("seek-prev-second", Gtk::Stock::GO_BACK,_("Seek Backward"),_("Seek Backward"));
 		action_group->add( action, sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_time),Time(-1)));
@@ -1737,7 +1748,7 @@ CanvasView::popup_layer_menu(synfig::Layer::Handle layer)
 }
 
 void
-CanvasView::register_layer_type(synfig::Layer::Book::value_type &lyr,std::map<synfig::String,Gtk::Menu*>* category_map)
+CanvasView::register_layer_type(synfig::Layer::Book::value_type &/*lyr*/,std::map<synfig::String,Gtk::Menu*>* /*category_map*/)
 {
 /*	if(lyr.second.category==_("Do Not Use"))
 		return;
@@ -1757,7 +1768,7 @@ CanvasView::register_layer_type(synfig::Layer::Book::value_type &lyr,std::map<sy
 }
 
 void
-CanvasView::build_new_layer_menu(Gtk::Menu &menu)
+CanvasView::build_new_layer_menu(Gtk::Menu &/*menu*/)
 {
 /*
 	std::map<synfig::String,Gtk::Menu*> category_map;
@@ -2079,7 +2090,7 @@ CanvasView::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamL
 }
 
 bool
-CanvasView::on_layer_user_click(int button, Gtk::TreeRow row, LayerTree::ColumnID column_id)
+CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::ColumnID /*column_id*/)
 {
 	switch(button)
 	{
@@ -2219,6 +2230,12 @@ CanvasView::on_children_user_click(int button, Gtk::TreeRow row, ChildrenTree::C
 			if(!(bool)row[children_tree_model.is_canvas])
 			{
 				synfigapp::ValueDesc value_desc=row[children_tree_model.value_desc];
+				if (!value_desc)
+				{
+					//! \todo fix properly -- what is the child dialog for?
+					synfig::info("preventing child dialog right-click crash");
+					return true;
+				}
 				assert(value_desc);
 				popup_param_menu(value_desc);
 				return true;
@@ -2815,7 +2832,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;
@@ -3003,7 +3022,7 @@ CanvasView::on_waypoint_delete()
 }
 
 void
-CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& selection_data_, guint info, guint time)
+CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int /*x*/, int /*y*/, const Gtk::SelectionData& selection_data_, guint /*info*/, guint time)
 {
 	// We will make this true once we have a solid drop
 	bool success(false);
@@ -3036,7 +3055,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"