Responding to an anonymous tip, officers arrived at the Mantus Lounge in the 1500 block of Main Street just after 3:30 a.m.
Police said James Huffer Jr. went to the club in search of his former girlfriend. The club was closed at the time, with only 10 employees inside. Employees told police that Huffer was inside and threatening to kill himself.
Sgt. Warren Mitchell said they described him as the man who stole the police car.
""They immediately recognized him because it was a place he and his girlfriend used to frequent," he said. "She was also there, and they made eye contact, but she was able to hide."
On Dec. 12, Huffer was arrested on an assault charge over an attack on his former girlfriend, but escaped -- while handcuffed -- in a Dallas police car. The police vehicle was later abandoned in Arlington.
Police said Huffer assaulted his former girlfriend earlier that day.
Mantus Lounge employees were able to get Huffer outside, where he barricaded himself in a courtyard area the club shares with the Iron Cactus, a neighboring restaurant.
Police said Huffer's former girlfriend was afraid he was going to kill her.
"Without a doubt -- as most of you know, three days ago, he had threatened to kill her, and he was also armed," Mitchell said.
Dallas SWAT officers began discussions with Huffer, attempting to talk him out of harming himself.
During the discussion, police shut down the adjacent area along Main Street.
Huffer surrendered shortly thereafter and was taken to Parkland Hospital for evaluation.
He faces an unlawful carrying charge, theft of a police vehicle and two counts of assault in connection with an attack on his former girlfriend. Huffer also faces drug charges in Tarrant County.