Fix a bug with attaching ends in ExtendTool

[r2c2.git] / source / designer / extendtool.cpp

diff --git a/source/designer/extendtool.cpp b/source/designer/extendtool.cpp
index 021f184a8fb89a4393a9b8dfa6525691ad0da426..9b6ec9ab606474bd5c1facfdd9d2b623fb86d80c 100644 (file)
--- a/source/designer/extendtool.cpp
+++ b/source/designer/extendtool.cpp
@@ -22,8 +22,8 @@ ExtendTool::ExtendTool(Designer &d, Input::Keyboard &k, Input::Mouse &m, const s
 
        if(unlinked_endpoints.empty())
        {
-               done = true;
                set_status("No free endpoints");
+               set_done(false);
        }
 
        const Catalogue::ObjectMap &object_types = designer.get_catalogue().get_all();
@@ -52,7 +52,7 @@ ExtendTool::~ExtendTool()
 
 void ExtendTool::connect()
 {
-       float limit = designer.get_layout().get_catalogue().get_gauge()/10;
+       float limit;
 
        Track *start_track = 0;
        Track *end_track = 0;
@@ -62,6 +62,7 @@ void ExtendTool::connect()
        for(vector<TrackIter>::const_iterator i=unlinked_endpoints.begin(); i!=unlinked_endpoints.end(); ++i)
        {
                start_sn = (*i)->get_snap_node(i->entry());
+               limit = (*i)->get_type().get_appearance().get_gauge()/10;
                
                for(vector<TrackIter>::const_iterator j=i; ++j!=unlinked_endpoints.end(); )
                {
@@ -83,6 +84,8 @@ void ExtendTool::connect()
                        if(gap<0)
                                continue;
 
+                       start_track = i->track();
+                       end_track = j->track();
                        ok = true;
                }
 
@@ -93,6 +96,7 @@ void ExtendTool::connect()
        if(!ok)
        {
                set_status("No aligned endpoints found");
+               set_done(false);
                return;
        }
 
@@ -101,6 +105,7 @@ void ExtendTool::connect()
        if(extend_tracks.empty())
        {
                set_status("No connection possible");
+               set_done(false);
                return;
        }
 
@@ -162,9 +167,12 @@ void ExtendTool::pointer_motion()
 
 void ExtendTool::finish()
 {
-       for(vector<TrackIter>::const_iterator i=unlinked_endpoints.begin(); i!=unlinked_endpoints.end(); ++i)
-               if(extend_tracks.front()->link_to(**i))
-                       break;
+       if(!extend_tracks.empty())
+       {
+               for(vector<TrackIter>::const_iterator i=unlinked_endpoints.begin(); i!=unlinked_endpoints.end(); ++i)
+                       if(extend_tracks.front()->link_to(**i))
+                               break;
+       }
 }
 
 vector<Track *> ExtendTool::create_straight(const Vector &start, const Angle &dir, float length, float limit)