X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=0c0f7ac28d1df8fde5b7898fce99f8b0fadcb001;hb=d07cf2aeaf95ac90d7eca16ab39a4c4bda9743e6;hp=122e96b68780a6487e748cc3e394ca9856f71c74;hpb=aaa93ae0438cbcdbe73b69ff976155ce861dac09;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index 122e96b..0c0f7ac 100644
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.cpp
@@ -189,26 +189,36 @@ studio::Instance::save_as(const synfig::String &file_name)
 {
 	if(synfigapp::Instance::save_as(file_name))
 	{
+		// after changing the filename, update the render settings with the new filename
+		list<handle<CanvasView> >::iterator iter;
+		for(iter=canvas_view_list().begin();iter!=canvas_view_list().end();iter++)
+			(*iter)->render_settings.set_entry_filename();
 		App::add_recent_file(file_name);
 		return true;
 	}
 	return false;
 }
 
-bool
+Instance::Status
 studio::Instance::save()
 {
-	if(basename(get_file_name()).find("Synfig Animation")==0)
-	{
-		dialog_save_as();
-		return true;
-	}
+	// the filename will be set to "Synfig Animation 1" or some such when first created
+	// and will be changed to an absolute path once it has been saved
+	// so if it still begins with "Synfig Animation " then we need to ask where to save it
+	if(get_file_name().find(DEFAULT_FILENAME_PREFIX)==0)
+		if (dialog_save_as())
+			return STATUS_OK;
+		else
+			return STATUS_CANCEL;
 
-	return synfigapp::Instance::save();
+	if (synfigapp::Instance::save())
+		return STATUS_OK;
 
+	App::dialog_error_blocking("Save - Error","Unable to save to '" + get_file_name() + "'");
+	return STATUS_ERROR;
 }
 
-void
+bool
 studio::Instance::dialog_save_as()
 {
 	string filename=basename(get_file_name());
@@ -232,7 +242,7 @@ studio::Instance::dialog_save_as()
 						"other files first before trying to use \"SaveAs\"."
 					);
 
-					return;
+					return false;
 				}
 				if(parent_layer)
 					break;
@@ -273,9 +283,19 @@ studio::Instance::dialog_save_as()
 
 		{
 			struct stat	s;
-			// if stat() succeeds, or it fails with something other than 'file doesn't exist', the file exists
+			int stat_return = stat(filename.c_str(), &s);
+
+			// if stat() fails with something other than 'file doesn't exist', there's been a real
+			// error of some kind.  let's give up now and ask for a new path.
+			if (stat_return == -1 && errno != ENOENT)
+			{
+				perror(filename.c_str());
+				App::dialog_error_blocking("SaveAs - Error","Unable to check whether '" + filename + "' exists.");
+				continue;
+			}
+
 			// if the file exists and the user doesn't want to overwrite it, keep prompting for a filename
-			if ((stat(filename.c_str(), &s) != -1 || errno != ENOENT) &&
+			if ((stat_return == 0) &&
 				!App::dialog_yes_no("File exists",
 									"A file named '" +
 									filename +
@@ -285,10 +305,12 @@ studio::Instance::dialog_save_as()
 		}
 
 		if(save_as(filename))
-			break;
+			return true;
 
-		App::dialog_error_blocking("SaveAs - Error","Unable to save file");
+		App::dialog_error_blocking("SaveAs - Error","Unable to save to '" + filename + "'");
 	}
+
+	return false;
 }
 
 void
@@ -621,18 +643,33 @@ Instance::safe_revert()
 bool
 Instance::safe_close()
 {
-	handle<synfigapp::UIInterface> uim;
-	uim=find_canvas_view(get_canvas())->get_ui_interface();
+	handle<CanvasView> canvas_view = find_canvas_view(get_canvas());
+	handle<synfigapp::UIInterface> uim=canvas_view->get_ui_interface();
 
-	if(get_action_count())
+	// if the animation is currently playing, closing the window will cause a crash,
+	// so don't allow it
+	if (canvas_view->is_playing())
 	{
-		string str=strprintf(_("Would you like to save your changes to %s?"),basename(get_file_name()).c_str() );
-		int answer=uim->yes_no_cancel(get_canvas()->get_name(),str,synfigapp::UIInterface::RESPONSE_YES);
-		if(answer==synfigapp::UIInterface::RESPONSE_YES)
-			save();
-		if(answer==synfigapp::UIInterface::RESPONSE_CANCEL)
-			return false;
+		canvas_view->present();
+		App::dialog_error_blocking("Close Error", "The animation is currently playing so the window cannot be closed.");
+		return false;
 	}
+	if(get_action_count())
+		do
+		{
+			string str=strprintf(_("Would you like to save your changes to %s?"),basename(get_file_name()).c_str() );
+			int answer=uim->yes_no_cancel(get_canvas()->get_name(),str,synfigapp::UIInterface::RESPONSE_YES);
+			if(answer==synfigapp::UIInterface::RESPONSE_YES)
+			{
+				enum Status status = save();
+				if (status == STATUS_OK) break;
+				else if (status == STATUS_CANCEL) return false;
+			}
+			if(answer==synfigapp::UIInterface::RESPONSE_NO)
+				break;
+			if(answer==synfigapp::UIInterface::RESPONSE_CANCEL)
+				return false;
+		} while (true);
 
 	if(is_modified())
 	{