X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=f0451ad0818d5d7d763f3d3f02c38c3d39030244;hb=4c3c01b90796b1ac068f95cfc7227914cd5c3b33;hp=8a1addf3b3fdb193add46243e39897ce4601df51;hpb=18cb5645587e00da244d98aca07fe809fd9ed13e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index 8a1addf..f0451ad 100644
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.cpp
@@ -225,7 +225,7 @@ studio::Instance::save()
 bool
 studio::Instance::dialog_save_as()
 {
-	string filename=basename(get_file_name());
+	string filename = get_file_name();
 	Canvas::Handle canvas(get_canvas());
 
 	{
@@ -255,16 +255,16 @@ studio::Instance::dialog_save_as()
 	}
 
 	// show the canvas' name if it has one, else its ID
-	while(App::dialog_save_file(_("Choose a Filename to Save As") +
-								String(" (") +
-								(canvas->get_name().empty()
-								 ? canvas->get_id()
-								 : canvas->get_name()) +
-								") ...", filename))
+	while (App::dialog_save_file((_("Choose a Filename to Save As") +
+								  String(" (") +
+								  (canvas->get_name().empty() ? canvas->get_id() : canvas->get_name()) +
+								  ") ..."),
+								 filename, ANIMATION_DIR_PREFERENCE))
 	{
 		// If the filename still has wildcards, then we should
 		// continue looking for the file we want
-		if(find(filename.begin(),filename.end(),'*')!=filename.end())
+		string base_filename = basename(filename);
+		if (find(base_filename.begin(),base_filename.end(),'*')!=base_filename.end())
 			continue;
 
 		if (filename_extension(filename) == "")
@@ -1100,10 +1100,8 @@ edit_several_waypoints(etl::handle<CanvasView> canvas_view, std::list<synfigapp:
 	dialog.add_button(Gtk::StockID("gtk-cancel"),0);
 	dialog.show();
 
-	DEBUGPOINT();
 	if(dialog.run()==0 || widget_waypoint_model.get_waypoint_model().is_trivial())
 		return;
-	DEBUGPOINT();
 	synfigapp::Action::PassiveGrouper group(canvas_interface->get_instance().get(),_("Set Waypoints"));
 
 	std::list<synfigapp::ValueDesc>::iterator iter;