The star and circle tool were both causing warnings from gtkmm 2.14. This prevents...

[synfig.git] / synfig-studio / trunk / src / gtkmm / state_circle.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/state_circle.cpp b/synfig-studio/trunk/src/gtkmm/state_circle.cpp
index f23632c..38dd7b3 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_circle.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_circle.cpp
@@ -382,10 +382,10 @@ StateCircle_Context::StateCircle_Context(CanvasView* canvas_view):
        duckmatic_push(get_work_area()),
        prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()),
        settings(synfigapp::Main::get_selected_input_device()->settings()),
-       entry_id(),
-       adj_feather(0,0,1,0.01,0.1),
-       adj_number_of_bline_points(4,2,120,1,1,1), // value, lower, upper, step_increment, page_increment, page_size
-       adj_bline_point_angle_offset(0,-360,360,.1,1,1), // value, lower, upper, step_increment, page_increment, page_size
+       entry_id(),                             //   value lower upper  step page
+       adj_feather(                                    0,    0,    1, 0.01, 0.1),
+       adj_number_of_bline_points(             0,    2,  120, 1   , 1  ),
+       adj_bline_point_angle_offset(   0, -360,  360, 0.1 , 1  ),
        spin_feather(adj_feather,0.1,3),
        spin_number_of_bline_points(adj_number_of_bline_points,1,0),
        spin_bline_point_angle_offset(adj_bline_point_angle_offset,1,1),
@@ -934,6 +934,7 @@ StateCircle_Context::event_mouse_click_handler(const Smach::event& x)
 
        if(event.key==EVENT_WORKAREA_MOUSE_BUTTON_DRAG && event.button==BUTTON_LEFT)
        {
+               if (!point2_duck) return Smach::RESULT_OK;
                point2_duck->set_point(point_holder-get_work_area()->snap_point_to_grid(event.pos));
                get_work_area()->queue_draw();
                return Smach::RESULT_ACCEPT;