projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't enable the use of mutexes on platforms other than Windows unless pthread is...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
synfigapp
/
canvasinterface.cpp
diff --git
a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
index
40d14df
..
d3d96c7
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
+++ b/
synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
@@
-579,10
+579,10
@@
CanvasInterface::import(const synfig::String &filename, bool /*copy*/)
// If this is a SIF file, then we need to do things slightly differently
if(ext=="sif" || ext=="sifz")try
{
// If this is a SIF file, then we need to do things slightly differently
if(ext=="sif" || ext=="sifz")try
{
-
- Canvas::Handle outside_canvas(synfig::open_canvas(filename));
+ String errors;
+ Canvas::Handle outside_canvas(synfig::open_canvas(filename
, errors
));
if(!outside_canvas)
if(!outside_canvas)
- throw String(_("Unable to open this composition"));
+ throw String(_("Unable to open this composition"))
+ ":\n\n" + errors
;
Layer::Handle layer(add_layer_to("PasteCanvas",get_canvas()));
if(!layer)
Layer::Handle layer(add_layer_to("PasteCanvas",get_canvas()));
if(!layer)
@@
-596,7
+596,7
@@
CanvasInterface::import(const synfig::String &filename, bool /*copy*/)
}
catch(String x)
{
}
catch(String x)
{
- get_ui_interface()->error(
x+" -- "+filename
);
+ get_ui_interface()->error(
filename + ": " + x
);
return false;
}
catch(...)
return false;
}
catch(...)