From 2e66c88edf33d571b15a3fc395772f0eb0f5a397 Mon Sep 17 00:00:00 2001
From: Lukas W <lukaswhl@gmail.com>
Date: Sun, 2 Nov 2014 00:51:24 +0100
Subject: [PATCH] Store recovery file path in configManager

---
 include/config_mgr.h    | 6 ++++++
 src/core/config_mgr.cpp | 3 ++-
 src/core/main.cpp       | 2 +-
 src/gui/MainWindow.cpp  | 6 ++----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/include/config_mgr.h b/include/config_mgr.h
index 480c4d0de..6905b91a4 100644
--- a/include/config_mgr.h
+++ b/include/config_mgr.h
@@ -139,6 +139,11 @@ public:
 		return( m_ladDir );
 	}
 
+	const QString & recoveryFile() const
+	{
+		return m_recoveryFile;
+	}
+
 #ifdef LMMS_HAVE_STK
 	const QString & stkDir() const
 	{
@@ -200,6 +205,7 @@ 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/config_mgr.cpp b/src/core/config_mgr.cpp
index c9a930f0b..487d28919 100644
--- a/src/core/config_mgr.cpp
+++ b/src/core/config_mgr.cpp
@@ -66,7 +66,8 @@ configManager::configManager() :
 	m_pluginDir( qApp->applicationDirPath() + '/' + PLUGIN_DIR ),
 #endif
 	m_vstDir( m_workingDir + "vst" + QDir::separator() ),
-	m_flDir( QDir::home().absolutePath() )
+	m_flDir( QDir::home().absolutePath() ),
+	m_recoveryFile( QDir(m_workingDir).absoluteFilePath("recover.mmp") )
 {
 }
 
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 31dd6309b..b2feaade2 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -422,7 +422,7 @@ int main( int argc, char * * argv )
 		srand( getpid() + time( 0 ) );
 
 		// recover a file?
-		QString recoveryFile = QDir(configManager::inst()->workingDir()).absoluteFilePath("recover.dataFile");
+		QString recoveryFile = configManager::inst()->recoveryFile();
 		if( QFileInfo(recoveryFile).exists() &&
 			QMessageBox::question( engine::mainWindow(), MainWindow::tr( "Project recovery" ),
 						MainWindow::tr( "It looks like the last session did not end properly. "
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 3d1b707fc..7958eebc8 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -1000,8 +1000,7 @@ void MainWindow::closeEvent( QCloseEvent * _ce )
 	if( mayChangeProject() )
 	{
 		// delete recovery file
-		QDir working(configManager::inst()->workingDir());
-		working.remove("recover.mmp");
+		QFile::remove(configManager::inst()->recoveryFile());
 		_ce->accept();
 	}
 	else
@@ -1146,8 +1145,7 @@ void MainWindow::autoSave()
 	if( !( engine::getSong()->isPlaying() ||
 			engine::getSong()->isExporting() ) )
 	{
-		QDir work(configManager::inst()->workingDir());
-		engine::getSong()->saveProjectFile(work.absoluteFilePath("recover.mmp"));
+		engine::getSong()->saveProjectFile(configManager::inst()->recoveryFile());
 	}
 	else
 	{