X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcanvas.cpp;h=2997ff4b358f593eca972ba71b996fd80b8ea912;hb=c0a582461a1c9aea914baf7889534aaf9ff4434c;hp=5592aa0accec63d5877f0982fda0e53ec13f6edd;hpb=6c6dde907eadafe73e401781fd2ffb6c6223ec85;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index 5592aa0..2997ff4 100644
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -544,7 +544,7 @@ Canvas::surefind_canvas(const String &id)
 				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name, errors);
 
 			if(!external_canvas)
-				throw Exception::FileNotFound(file_name);
+				throw runtime_error(errors);
 			externals_[file_name]=external_canvas;
 		}
 
@@ -596,7 +596,8 @@ Canvas::find_canvas(const String &id)
 Canvas::ConstHandle
 Canvas::find_canvas(const String &id)const
 {
-	if(is_inline() && parent_)return parent_->find_canvas(id);
+	if(is_inline() && parent_)
+		return parent_->find_canvas(id);
 
 	if(id.empty())
 		return this;
@@ -630,7 +631,7 @@ Canvas::find_canvas(const String &id)const
 				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name, errors);
 
 			if(!external_canvas)
-				throw Exception::FileNotFound(file_name);
+				throw runtime_error(errors);
 			externals_[file_name]=external_canvas;
 		}
 
@@ -654,7 +655,7 @@ Canvas::find_canvas(const String &id)const
 
 	// If the first character is the separator, then
 	// this references the root canvas.
-	if(id.find_first_of(':')==0)
+	if(id[0]==':')
 		return get_root()->find_canvas(string(id,1));
 
 	// Now we know that the requested Canvas is in a child