I have the same problems. When you open the door does the glass drop? Mine did and I found pushing the glass down - it moved about half inch . Slammed the door hard., the glass moved up as normal and I could lock it. Yes you will need a new lock.
Hope this helps.