SAN ANTONIO — A judge says an 80-year-old Army veteran can have his dog back, for now.

Since July, Jim Martin, his friends, and the agency, Lone Star Westie Rescue, have been at odds over who should keep Olaf the dog.

The judge's decision places the dog back in the home with Martin. Ever since the dog was first found it was receiving care through Lone Star Westie Rescue and living with a foster.

During Friday’s temporary injunction hearing, the court heard a lot of passionate testimony from both sides, including from Martin and the Lone Star Westie Rescue Executive Director, Elizabeth Escobar.

The rescue argued the adoption agreement was breached because Olaf was in poor health and had several medical conditions when he was found.

Martin's attorneys argued the best thing would be to return Olaf to Martin's care for now.

Olaf and Martin are expected to reunited by Saturday.

Another trial could start late October or early November.

Previous Coverage:

Senior citizen begs rescue group for dog's return
Olaf investigation continues as owner remains hopeful

Army Veteran's fight for dogs heads to court