Open correct VST folder in previously saved projects with existing Ve…

…STige instruments.
LMMS · May 10, 2017 · 33c7b5a · 33c7b5a
1 parent baca586
commit 33c7b5a
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp
@@ -174,17 +174,6 @@ void vestigeInstrument::setParameter( void )
 
 void vestigeInstrument::saveSettings( QDomDocument & _doc, QDomElement & _this )
 {
-	if( QFileInfo( m_pluginDLL ).isAbsolute() )
-	{
-		QString f = QString( m_pluginDLL ).replace( QDir::separator(), '/' );
-		QString vd = QString( ConfigManager::inst()->vstDir() ).replace( QDir::separator(), '/' );
-        	QString relativePath;
-		if( !( relativePath = f.section( vd, 1, 1 ) ).isEmpty() )
-		{
-			m_pluginDLL = relativePath;
-		}
-	}
-
 	_this.setAttribute( "plugin", m_pluginDLL );
 	m_pluginMutex.lock();
 	if( m_plugin != NULL )
@@ -254,8 +243,7 @@ void vestigeInstrument::loadFile( const QString & _file )
 	{
 		closePlugin();
 	}
-
-	m_pluginDLL = _file;
+	m_pluginDLL = SampleBuffer::tryToMakeRelative( _file );
 	TextFloat * tf = TextFloat::displayMessage(
 			tr( "Loading plugin" ),
 			tr( "Please wait while loading VST-plugin..." ),
@@ -268,7 +256,7 @@ void vestigeInstrument::loadFile( const QString & _file )
 		m_pluginMutex.unlock();
 		closePlugin();
 		delete tf;
-		collectErrorForUI( VstPlugin::tr( "The VST plugin %1 could not be loaded." ).arg( m_pluginDLL ) );
+		collectErrorForUI( VstPlugin::tr( "The VST plugin %1 could not be loaded." ).arg( QFileInfo( _file ).baseName() ) );
 		return;
 	}