When a .sif file fails to load, display the error messages in the studio GUI, not...

[synfig.git] / synfig-core / trunk / src / synfig / canvas.cpp

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index 67f06b9..5592aa0 100644 (file)
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -47,7 +47,7 @@ using namespace synfig;
 using namespace etl;
 using namespace std;
 
-namespace synfig { extern Canvas::Handle open_canvas(const String &filename); };
+namespace synfig { extern Canvas::Handle open_canvas(const String &filename, String &errors); };
 
 /* === M A C R O S ========================================================= */
 
@@ -537,10 +537,11 @@ Canvas::surefind_canvas(const String &id)
                        external_canvas=externals_[file_name];
                else
                {
+                       String errors;
                        if(is_absolute_path(file_name))
-                               external_canvas=open_canvas(file_name);
+                               external_canvas=open_canvas(file_name, errors);
                        else
-                               external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name);
+                               external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name, errors);
 
                        if(!external_canvas)
                                throw Exception::FileNotFound(file_name);
@@ -622,10 +623,11 @@ Canvas::find_canvas(const String &id)const
                        external_canvas=externals_[file_name];
                else
                {
+                       String errors;
                        if(is_absolute_path(file_name))
-                               external_canvas=open_canvas(file_name);
+                               external_canvas=open_canvas(file_name, errors);
                        else
-                               external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name);
+                               external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name, errors);
 
                        if(!external_canvas)
                                throw Exception::FileNotFound(file_name);