Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2016-10-10 15:08:08 +02:00
commit c316fe4e0b

View file

@ -264,7 +264,7 @@ int main_loop(int argc, char ** argv){
}
}else if(yna(in_string) == 'a'){
//abort controller startup
return 1;
return 0;
}
}
}
@ -286,7 +286,7 @@ int main_loop(int argc, char ** argv){
}
}else if(yna(in_string) == 'a'){
//abort controller startup
return 1;
return 0;
}
}
}