From 7ff9c4c52c977b8dcdf307ffe60e03e9b027891c Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 22 Oct 2014 15:30:48 +0200 Subject: whirligig: Always try to nucleate a new series --- src/whirligig.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/whirligig.c b/src/whirligig.c index 85952d26..0d72a26c 100644 --- a/src/whirligig.c +++ b/src/whirligig.c @@ -494,7 +494,6 @@ static void connect_series(struct window *win) while ( win->join_ptr < win->ws ) { int i; - int joined = 0; if ( win->join_ptr == 0 ) { win->join_ptr++; @@ -508,14 +507,15 @@ static void connect_series(struct window *win) if ( win->join_ptr > 1 ) { for ( i=0; iser[i][win->join_ptr-1] != -1 ) { - if ( try_join(win, i) ) joined = 1; + try_join(win, i); } } } - /* Failing that, try to nucleate a new series here */ - if ( !joined && (win->join_ptr > 0) - && (win->img[win->join_ptr-1].serial != 0) ) { + /* Try to nucleate a new series here */ + if ( (win->join_ptr > 0) + && (win->img[win->join_ptr-1].serial != 0) ) + { IntegerMatrix *m; int c1, c2; m = try_all(win, win->join_ptr-1, win->join_ptr, -- cgit v1.2.3