added hasNextCommand() to CommandManager and check it in doDraw() before dismiss