Charlie Sheen and his estranged wife have struck a deal that settles any custody issues, according to their lawyers.
Sheen and Brooke Mueller "reached an agreement that resolves their differences", lawyers for the pair said.
The statement said the details would be being kept confidential for the benefit of their twin sons.
Mueller was granted a temporary restraining order against Sheen earlier this month, claiming he had threatened her on a recent trip to the Bahamas.
A hearing had been scheduled for March 22.
In a related development, Los Angeles police say they have searched Sheen's home for guns that might be in violation of the restraining order.
Officers arrived at Sheen's Sherman Oaks home, searched for several hours and found one weapon, an antique gun.