Yes, that was indeed "Goldfinger." Probably my favorite moment from any Bond movie.
The witty, quippy Bond doesn't sit well with me because I read the books as well as saw the movies. Bond isn't a funny man. His remarks should be more ironic or sarcastic than an attempt to be funny.
The longer Moore played the part, the worse he got. "Moonraker" was the absolute rock bottom of all the Bond flicks in my book. A shame because he was so great as Simon Templar years earlier.