X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=84b0f452b0f563b2049e7a6fc61db3a2973d934d;hb=e2d2732c368b92259bba1bef890223831d997b5b;hp=8436ec916b91ff343e589c12a52ce6e8032de8a5;hpb=aba6e2238a7fe85197e57032bdc29ed53d97bf7e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 8436ec9..84b0f45 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -2004,6 +2004,7 @@ static bool _close_instance(etl::handle<Instance> instance)
 bool
 CanvasView::close_instance()
 {
+#ifdef SINGLE_THREADED
 	if (get_work_area()->get_updating())
 	{
 		get_work_area()->stop_updating(true); // stop and mark as cancelled
@@ -2014,6 +2015,7 @@ CanvasView::close_instance()
 			250);
 	}
 	else
+#endif
 		Glib::signal_timeout().connect(
 			sigc::bind(sigc::ptr_fun(_close_instance),
 					   (etl::handle<Instance>)get_instance()),
@@ -2035,14 +2037,20 @@ CanvasView::update_title()
 {
 	string title;
 
-	if(get_instance()->synfigapp::Instance::get_action_count())
-		title="*";
-	title+=etl::basename(get_instance()->get_file_name())
-		+" : ";
-	if(get_canvas()->get_name().empty())
-		title+='"'+get_canvas()->get_id()+'"';
-	else
-		title+='"'+get_canvas()->get_name()+'"';
+	title = strprintf("%s%s\"%s\"",
+					  (
+						  get_instance()->get_action_count()
+						  ? "*"
+						  : ""
+					  ), (
+						  get_instance()->has_real_filename()
+						  ? (etl::basename(get_instance()->get_file_name()) + " : ").c_str()
+						  : ""
+					  ), (
+						  get_canvas()->get_name().empty()
+						  ? get_canvas()->get_id().c_str()
+						  : get_canvas()->get_name().c_str()
+					  ));
 
 	if(get_instance()->synfigapp::Instance::in_repository())
 	{