Fixing double call to callback
Changes to support actually stopping on closing the movie