Merge branch 'stable-1.1'

Conflicts:
	include/MixHelpers.h
	src/core/FxMixer.cpp
This commit is contained in:
Vesa
2014-07-13 22:20:10 +03:00
6 changed files with 39 additions and 10 deletions

View File

@@ -170,9 +170,10 @@ void vestigeInstrument::saveSettings( QDomDocument & _doc, QDomElement & _this )
{
if( QFileInfo( m_pluginDLL ).isAbsolute() )
{
QString relativePath;
if( !( relativePath = m_pluginDLL.section( configManager::
inst()->vstDir(), 1, 1 ) ).isEmpty() )
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;
}