Merge pull request #2932 from lioncash/disc VolumeCreator: Use a unique_ptr in CreateVolumeFromFilename