Merge branch 'master' into nikitakit_master

[synfig.git] / synfig-studio / src / gtkmm / state_text.cpp

diff --git a/synfig-studio/src/gtkmm/state_text.cpp b/synfig-studio/src/gtkmm/state_text.cpp
index c1912ab..f475420 100644 (file)
--- a/synfig-studio/src/gtkmm/state_text.cpp
+++ b/synfig-studio/src/gtkmm/state_text.cpp
@@ -317,7 +317,7 @@ StateText_Context::StateText_Context(CanvasView *canvas_view):
 
        // Connect a signal
        //get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateText_Context::on_user_click));
-       get_canvas_view()->work_area->set_cursor(Gdk::CROSSHAIR);
+       get_work_area()->set_cursor(Gdk::XTERM);
 
        App::toolbox->refresh();
 }
@@ -344,7 +344,7 @@ StateText_Context::~StateText_Context()
 
        // Restore layer clicking
        get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_);
-       get_canvas_view()->work_area->reset_cursor();
+       get_work_area()->reset_cursor();
 
        App::dialog_tool_options->clear();
 
@@ -358,7 +358,9 @@ StateText_Context::~StateText_Context()
 Smach::event_result
 StateText_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