diff --git a/pool/page_reg.php b/pool/page_reg.php index f9c01d04..5b50894f 100644 --- a/pool/page_reg.php +++ b/pool/page_reg.php @@ -34,8 +34,8 @@ Your miner password should be 'x' and must not use your login pass $pg .= '
'; $pg .= '

Login

'; - if (isset($data['data']['error'])) - $pg .= "
".$data['data']['error']." - please try again

"; + if (isset($data['data']['error']) && !isset($_POST['pass2'])) + $pg .= "
".$data['data']['error']." - please try again

"; $pg .= makeForm(''); $pg .= " @@ -55,8 +55,8 @@ Your miner password should be 'x' and must not use your login pass $pg.= '
'; $pg .= '

Register

'; - if (isset($data['data']['error'])) - $pg .= "
".$data['data']['error']." - please try again

"; + if (isset($data['data']['error']) && isset($_POST['pass2'])) + $pg .= "
".$data['data']['error']." - please try again

"; $pg .= makeForm(''); $pg .= " diff --git a/src/ckpool.c b/src/ckpool.c index 6b9d1853..53ee35f6 100644 --- a/src/ckpool.c +++ b/src/ckpool.c @@ -2136,6 +2136,8 @@ int main(int argc, char **argv) } } + if (!ckp.handover) + manage_old_child(&ckp, &ckp.main); write_namepid(&ckp.main); open_process_sock(&ckp, &ckp.main, &ckp.main.us); launch_logger(&ckp.main);