In casual conversation this distinction is starting to fade, and "was" is often used in both the above situations.
_________________________________________________

Unfortunately, the distinction is getting blurred still further and people are even failing to differentiate between singular and plural. eg 'so what if we was there?'.
Anyone wishing to hear Estuary of this type used to great effect (heavy sarcasm implied) need only tune in to any episode of EastEnders to witness any number of examples.