Personally, I would've already had that conversation pretty much as soon as I saw the problem, before even getting to the point where you're stopping off at McDonald's or the bar. It's pretty unlikely that the first time it occurs to you that your partner would be mad is when you're opening the door to the McDonald's.

Communicate early, communicate often.