aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2014-10-22 15:30:48 +0200
committerThomas White <taw@physics.org>2015-01-29 13:23:38 +0100
commit7ff9c4c52c977b8dcdf307ffe60e03e9b027891c (patch)
tree305cc2938d42a6fa88a6ee50b7110d0b0f388b12
parent418adbdada14b90a0e9a0ac15fe67dd34fe62327 (diff)
whirligig: Always try to nucleate a new series
-rw-r--r--src/whirligig.c10
1 files changed, 5 insertions, 5 deletions
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; i<MAX_SER; i++ ) {
if ( win->ser[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,