Was he flirting or just being nice?

If he was just being nice then he would have stood up and offerred you his seat. You dont pull someone down to sit on your lap, Yes he was flirting.