Merge branch 'development' into LTS_development
This commit is contained in:
commit
c316fe4e0b
1 changed files with 2 additions and 2 deletions
|
@ -264,7 +264,7 @@ int main_loop(int argc, char ** argv){
|
||||||
}
|
}
|
||||||
}else if(yna(in_string) == 'a'){
|
}else if(yna(in_string) == 'a'){
|
||||||
//abort controller startup
|
//abort controller startup
|
||||||
return 1;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -286,7 +286,7 @@ int main_loop(int argc, char ** argv){
|
||||||
}
|
}
|
||||||
}else if(yna(in_string) == 'a'){
|
}else if(yna(in_string) == 'a'){
|
||||||
//abort controller startup
|
//abort controller startup
|
||||||
return 1;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue