Fix loading relative file path samples

Closes #2412
LMMS · Feb 10, 2016 · ca8f80d · ca8f80d
1 parent 1290e33
commit ca8f80d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/include/FileBrowser.h b/include/FileBrowser.h
@@ -201,7 +201,7 @@ class FileItem : public QTreeWidgetItem
 
 	QString fullName() const
 	{
-		return QFileInfo(m_path, text(0)).absoluteFilePath();
+		return QDir::cleanPath(m_path) + "/" + text(0);
 	}
 
 	inline FileTypes type( void ) const

diff --git a/include/SampleBuffer.h b/include/SampleBuffer.h
@@ -253,7 +253,7 @@ class EXPORT SampleBuffer : public QObject, public sharedObject
 	}
 
 	static QString tryToMakeRelative( const QString & _file );
-	static QString tryToMakeAbsolute( const QString & _file );
+	static QString tryToMakeAbsolute(const QString & file);
 
 
 public slots:

diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp
@@ -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() )
-	{
-		return _file;
-	}
+	QFileInfo f(file);
 
-	QString f = ConfigManager::inst()->userSamplesDir() + _file;
-	if( QFileInfo( f ).exists() )
+	if(f.isRelative())
 	{
-		return f;
+		f = QFileInfo(ConfigManager::inst()->userSamplesDir() + file);
+
+		if(! f.exists())
+		{
+			f = QFileInfo(ConfigManager::inst()->factorySamplesDir() + file);
+		}
 	}
 
-	return ConfigManager::inst()->factorySamplesDir() + _file;
+	if (f.exists()) {
+		return f.absoluteFilePath();
+	}
+	return file;
 }