At first glance it is sort of confusing, but the reasoning for this approach was because it was the most straightforward, minimalist way i could think to do this without revamping the entire section. (I just got the logic backwards - at least i think its right this time.)
oh well, now that you got me thinking, perhaps the symbol name should be: display_pre_upload_prompt_before_port_open? maybe this would make it more straightforward (albeit a bit verbose, which imho would be preferred for maintainability and comprehensibility).
Ah, yeah, I think that's probably why you made the mistake in the first place, and why I tripped over the name in the same way. I think the change you propose above would make much more sense. I can see us (myself) tripping over that in the future for sure.
Have you already committed the related previous patch?
Nope, not yet, wanna respin the original?
Thanks!
--Dan