X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcanvas.cpp;h=2bbb743366aed661dfc3dde7956999c420edee08;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=60f4be9533d6afbb40c9fbb928c91600cbf057f5;hpb=843ac7146b30c389db9123564d0727b71c64def2;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index 60f4be9..2bbb743 100644
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -537,17 +537,16 @@ Canvas::surefind_canvas(const String &id, String &warnings)
 
 		Canvas::Handle external_canvas;
 
+		if(!is_absolute_path(file_name))
+			file_name = get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name;
+
 		// If the composition is already open, then use it.
 		if(externals_.count(file_name))
 			external_canvas=externals_[file_name];
 		else
 		{
 			String errors;
-			if(is_absolute_path(file_name))
-				external_canvas=open_canvas(file_name, errors, warnings);
-			else
-				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name, errors, warnings);
-
+			external_canvas=open_canvas(file_name, errors, warnings);
 			if(!external_canvas)
 				throw runtime_error(errors);
 			externals_[file_name]=external_canvas;
@@ -624,17 +623,16 @@ Canvas::find_canvas(const String &id, String &warnings)const
 
 		Canvas::Handle external_canvas;
 
+		if(!is_absolute_path(file_name))
+			file_name = get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name;
+
 		// If the composition is already open, then use it.
 		if(externals_.count(file_name))
 			external_canvas=externals_[file_name];
 		else
 		{
 			String errors, warnings;
-			if(is_absolute_path(file_name))
-				external_canvas=open_canvas(file_name, errors, warnings);
-			else
-				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name, errors, warnings);
-
+			external_canvas=open_canvas(file_name, errors, warnings);
 			if(!external_canvas)
 				throw runtime_error(errors);
 			externals_[file_name]=external_canvas;
@@ -1385,3 +1383,26 @@ Canvas::rename_group(const String&old_name,const String&new_name)
 		(*iter)->add_to_group(new_name);
 	}
 }
+
+void
+Canvas::register_external_canvas(String file_name, Handle canvas)
+{
+	if(!is_absolute_path(file_name)) file_name = get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name;
+	externals_[file_name] = canvas;
+}
+
+#ifdef _DEBUG
+void
+Canvas::show_externals(String file, int line, String text) const
+{
+	printf("  .----- (externals for %lx '%s')\n  |  %s:%d %s\n", ulong(this), get_name().c_str(), file.c_str(), line, text.c_str());
+	std::map<String, Handle>::iterator iter;
+	for (iter = externals_.begin(); iter != externals_.end(); iter++)
+	{
+		synfig::String first(iter->first);
+		etl::loose_handle<Canvas> second(iter->second);
+		printf("  |    %40s : %lx (%d)\n", first.c_str(), ulong(&*second), second->count());
+	}
+	printf("  `-----\n\n");
+}
+#endif	// _DEBUG