From 3addec0e82d5f335537e48eb2aac1ba222d78c7d Mon Sep 17 00:00:00 2001 From: dooglus Date: Mon, 17 Sep 2007 11:35:02 +0000 Subject: [PATCH] Fix 1796110: don't try finding the specified canvas when no canvas is specified (ie. when the user clicks 'cancel' instead of typing a canvas name using 'other...' from a paste canvas layer's "canvas" parameter. git-svn-id: http://svn.voria.com/code@686 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp b/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp index c6f97cd..0df22a7 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp @@ -129,7 +129,14 @@ void Widget_CanvasChooser::chooser_menu() { String canvas_name; - App::dialog_entry(_("Choose Canvas"),_("Enter the relative name of the canvas that you want"),canvas_name); + + if (!App::dialog_entry(_("Choose Canvas"),_("Enter the relative name of the canvas that you want"),canvas_name)) + { + // the user hit 'cancel', so set the parameter back to its previous value + set_value_(canvas); + return; + } + Canvas::Handle new_canvas; try { -- 2.7.4