From 0a48b2f7bc3bce6eb88b02d6984029440b314582 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 5 Feb 2015 17:40:16 +0100 Subject: [PATCH] Fix: Respect custom working directory whenw riting recovery file Fixes #1726 --- include/ConfigManager.h | 5 ++--- src/core/ConfigManager.cpp | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/ConfigManager.h b/include/ConfigManager.h index b22792288..0db1cd789 100644 --- a/include/ConfigManager.h +++ b/include/ConfigManager.h @@ -140,9 +140,9 @@ public: return m_ladDir; } - const QString & recoveryFile() const + const QString recoveryFile() const { - return m_recoveryFile; + return m_workingDir + "recover.mmp"; } #ifdef LMMS_HAVE_STK @@ -206,7 +206,6 @@ private: QString m_vstDir; QString m_flDir; QString m_ladDir; - QString m_recoveryFile; #ifdef LMMS_HAVE_STK QString m_stkDir; #endif diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp index c556870c3..7fb9cbc5e 100644 --- a/src/core/ConfigManager.cpp +++ b/src/core/ConfigManager.cpp @@ -66,8 +66,7 @@ ConfigManager::ConfigManager() : m_pluginDir( qApp->applicationDirPath() + '/' + PLUGIN_DIR ), #endif m_vstDir( m_workingDir + "vst" + QDir::separator() ), - m_flDir( QDir::home().absolutePath() ), - m_recoveryFile( QDir(m_workingDir).absoluteFilePath("recover.mmp") ) + m_flDir( QDir::home().absolutePath() ) { }