Because this is a conditional, I prefer the second. But I don't consider the first to be completely wrong.
Can I say to a friend:
So, you're telling me if James agrees to go out with me, you won't be upset?
So, you're telling me if James agrees to go out with me, you wouldn't be upset?
Are both okay?
So 1 is the only perfectly correct sentence; the second is a mixed bag, neither here nor there, though not as bad as the now-very-common If you would have... I would...with both clauses in the conditional mood.