It's gonna be the future soon...

In transcription, this issue comes up all the time. We are in general not allowed to change the speakers' words, but often things that sound grammatically correct aloud are difficult to make correct in text. The biggest offender that I have trouble with is when the speaker is quoting someone else's interrogative within a dependent/subordinate clause, requiring (to my mind) both a question mark at the end of the quotation and a comma before the independent/main clause.

So, what do you think?

[Poll #1445523]