Competition between radiative and non-radiative decay for the doubly-excited 1s23lnl' states in O4+