Merge branch 'master' into nikitakit_master

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

diff --git a/synfig-studio/src/gtkmm/state_star.cpp b/synfig-studio/src/gtkmm/state_star.cpp
index e5b3ace..270571a 100644 (file)
--- a/synfig-studio/src/gtkmm/state_star.cpp
+++ b/synfig-studio/src/gtkmm/state_star.cpp
@@ -38,6 +38,7 @@
 #include <synfig/valuenode_bline.h>
 
 #include "state_star.h"
+#include "state_normal.h"
 #include "canvasview.h"
 #include "workarea.h"
 #include "app.h"
@@ -215,7 +216,7 @@ public:
        Smach::event_result event_layer_selection_changed_handler(const Smach::event& /*x*/)
        {
                if(egress_on_selection_change)
-                       throw Smach::egress_exception();
+                       throw &state_normal; //throw Smach::egress_exception();
                return Smach::RESULT_OK;
        }
 
@@ -510,7 +511,7 @@ StateStar_Context::StateStar_Context(CanvasView* canvas_view):
 
        // Connect a signal
        //get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateStar_Context::on_user_click));
-       get_canvas_view()->work_area->set_cursor(Gdk::CROSSHAIR);
+       get_work_area()->set_cursor(Gdk::STAR);
 
        App::toolbox->refresh();
 }
@@ -537,7 +538,7 @@ StateStar_Context::~StateStar_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();
 
@@ -558,7 +559,9 @@ StateStar_Context::~StateStar_Context()
 Smach::event_result
 StateStar_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