projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove .gitignore do nothing is ignored.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
widget_canvaschooser.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
b/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
index
e151644
..
568c4b0
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
@@
-146,16
+146,17
@@
Widget_CanvasChooser::chooser_menu()
set_value_(canvas);
return;
}
set_value_(canvas);
return;
}
-
+
Canvas::Handle new_canvas;
try
{
Canvas::Handle new_canvas;
try
{
- new_canvas=parent_canvas->find_canvas(canvas_name);
+ String warnings;
+ new_canvas=parent_canvas->find_canvas(canvas_name, warnings);
set_value_(new_canvas);
}
catch(std::runtime_error x)
{
set_value_(new_canvas);
}
catch(std::runtime_error x)
{
- App::dialog_error_blocking(_("Error:Exception Thrown"),x.what());
+ App::dialog_error_blocking(_("Error:Exception Thrown"),
String(_("Error selecting canvas:\n\n")) +
x.what());
set_value_(canvas);
}
catch(...)
set_value_(canvas);
}
catch(...)