Changeset 640

Show
Ignore:
Timestamp:
11/09/08 22:31:05 (2 months ago)
Author:
wolke
Message:

small changes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/new_fx_rack_and_sample_fun/Sconstruct

    r625 r640  
    276276opts.Add('libarchive', 'Set to 1 to enable libarchive instead of libtar', 0) 
    277277opts.Add('prefix','Default: /usr/local',"/usr/local") 
    278 opts.Add('destdir','Default: none',"") 
     278opts.Add('DESTDIR','Default: none',"") 
    279279 
    280280#platform dependent settings 
    …… 
    335335 
    336336install_prefix = ARGUMENTS.get('prefix',"/usr/local") 
    337 destdir = ARGUMENTS.get('destdir',"") 
     337destdir = ARGUMENTS.get('DESTDIR',"") 
    338338 
    339339 

  • branches/new_fx_rack_and_sample_fun/gui/src/HydrogenApp.cpp

    r632 r640  
    338338                        m_pSampleEditor->close(); 
    339339                        delete m_pSampleEditor; 
     340                        m_pSampleEditor = NULL; 
    340341                } 
    341342        } 

  • branches/new_fx_rack_and_sample_fun/gui/src/SampleEditor/SampleEditor.cpp

    r637 r640  
    7474//this new sample give us the not changed real samplelength  
    7575        m_pSamplefromFile = Sample::load( mSamplefilename ); 
     76        if (!m_pSamplefromFile) reject(); 
    7677 
    7778        unsigned slframes = m_pSamplefromFile->get_n_frames();