mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-17 11:18:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading relative file path samples

Browse Source 
Closes #2412
This commit is contained in:
Lukas W
2016-02-11 11:58:42 +13:00
parent 1290e33207
commit ca8f80d44f
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/SampleBuffer.cpp
View File

@@ -1414,20 +1414,24 @@ QString SampleBuffer::tryToMakeRelative( const QString & _file )
QString SampleBuffer::tryToMakeAbsolute( const QString & _file )
QString SampleBuffer::tryToMakeAbsolute(const QString& file)
{
if( QFileInfo( _file ).isAbsolute() )
QFileInfo f(file);
if(f.isRelative())
{
return _file;
f = QFileInfo(ConfigManager::inst()->userSamplesDir() + file);
if(! f.exists())
{
f = QFileInfo(ConfigManager::inst()->factorySamplesDir() + file);
}
}
QString f = ConfigManager::inst()->userSamplesDir() + _file;
if( QFileInfo( f ).exists() )
{
return f;
if (f.exists()) {
return f.absoluteFilePath();
}
return ConfigManager::inst()->factorySamplesDir() + _file;
return file;
}