X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fgtkmm%2Fstate_draw.cpp;h=44820450b30caf9508ba095490edc4e062992e2c;hb=60625faec2a962c4c9de782c43bfe51b494547c3;hp=4d058f253349d5af299119d05573111751546496;hpb=233516438ff772fc41f365e7d323acae89fc3ac3;p=synfig.git

diff --git a/synfig-studio/src/gtkmm/state_draw.cpp b/synfig-studio/src/gtkmm/state_draw.cpp
index 4d058f2..4482045 100644
--- a/synfig-studio/src/gtkmm/state_draw.cpp
+++ b/synfig-studio/src/gtkmm/state_draw.cpp
@@ -38,6 +38,7 @@
 
 #include "state_draw.h"
 #include "state_stroke.h"
+#include "state_normal.h"
 #include "canvasview.h"
 #include "workarea.h"
 #include "app.h"
@@ -487,7 +488,7 @@ StateDraw_Context::StateDraw_Context(CanvasView* canvas_view):
 	// Connect a signal
 	//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateDraw_Context::on_user_click));
 
-	get_canvas_view()->work_area->set_cursor(Gdk::PENCIL);
+	get_work_area()->set_cursor(Gdk::PENCIL);
 
 	App::toolbox->refresh();
 
@@ -544,7 +545,7 @@ StateDraw_Context::~StateDraw_Context()
 
 	get_work_area()->set_type_mask(old_duckmask);
 
-	get_canvas_view()->work_area->reset_cursor();
+	get_work_area()->reset_cursor();
 
 	// Restore layer clicking
 	get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_);
@@ -567,7 +568,9 @@ StateDraw_Context::~StateDraw_Context()
 Smach::event_result
 StateDraw_Context::event_stop_handler(const Smach::event& /*x*/)
 {
-	throw Smach::egress_exception();
+	//throw Smach::egress_exception();
+	throw &state_normal;
+	return Smach::RESULT_OK;
 }
 
 Smach::event_result