mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-01 19:35:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #2537. GigaSampler can load both relative and absolute paths from project file. File dialog shows correctly directory of current file.

Browse Source
This commit is contained in:
Karmo Rosental
2016-03-26 00:07:50 +02:00
parent 770c07ff58
commit a31b8c4ff3
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/GigPlayer/GigPlayer.cpp
View File

@@ -209,7 +209,7 @@ void GigInstrument::openFile( const QString & _gigFile, bool updateTrackName )
try
{
m_instance = new GigInstance( _gigFile );
m_instance = new GigInstance( SampleBuffer::tryToMakeAbsolute( _gigFile ) );
m_filename = SampleBuffer::tryToMakeRelative( _gigFile );
}
catch( ... )
@@ -1067,18 +1067,7 @@ void GigInstrumentView::showFileDialog()
QString dir;
if( k->m_filename != "" )
{
QString f = k->m_filename;
if( QFileInfo( f ).isRelative() )
{
f = ConfigManager::inst()->gigDir() + f;
if( QFileInfo( f ).exists() == false )
{
f = ConfigManager::inst()->factorySamplesDir() + k->m_filename;
}
}
QString f = SampleBuffer::tryToMakeAbsolute( k->m_filename );
ofd.setDirectory( QFileInfo( f ).absolutePath() );
ofd.selectFile( QFileInfo( f ).fileName() );
}