Show
Ignore:
Timestamp:
08/25/08 17:20:42 (6 years ago)
Author:
robert
Message:

From Michael Guerrero, Fixed crash that occurred when openning an new movie file after all previous movie ImageStream? had been closed. Also add a missing close of the movie file.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/quicktime/MovieData.cpp

    r6701 r8792  
    2424 
    2525MovieData::~MovieData() 
    26 { 
     26{   
    2727    if (_pointer) free(_pointer); 
    2828    if (_gw) DisposeGWorld(_gw); 
    29     if (_movie) DisposeMovie(_movie); 
     29 
     30    if (_movie) { 
     31        CloseMovieFile(_resref); 
     32        DisposeMovie(_movie); 
     33    } 
    3034} 
    3135     
     
    4246    osg::notify(osg::INFO) << "MovieData :: opening movie '" << filename << "'" << std::endl; 
    4347     
    44     OSStatus err = MakeMovieFromPath(filename.c_str(),&_movie); 
     48    OSStatus err = MakeMovieFromPath(filename.c_str(), &_movie, _resref); 
    4549    if (err !=0) { 
    4650        _fError = true;