Changed: Use getInstallerInstalledFilePath() to get installed Installer full path

--HG--
branch : develop

code/ryzom/tools/client/ryzom_installer/src/configfile.cpp

@@ -756,12 +756,15 @@ QString CConfigFile::getInstallerCurrentDirPath() const
 	return QApplication::applicationDirPath();
 }
 
-QString CConfigFile::getInstallerOriginalFilePath() const
+QString CConfigFile::getInstallerInstalledFilePath() const
 {
-	return getInstallerOriginalDirPath() + "/" + QFileInfo(QApplication::applicationFilePath()).fileName();
+	// return an empty string, if no Installer filename in config
+	if (m_installerFilename.isEmpty()) return "";
+
+	return getInstallerInstalledDirPath() + "/" + m_installerFilename;
 }
 
-QString CConfigFile::getInstallerOriginalDirPath() const
+QString CConfigFile::getInstallerInstalledDirPath() const
 {
 	return m_installationDirectory;
 }

code/ryzom/tools/client/ryzom_installer/src/configfile.h

@@ -124,8 +124,8 @@ public:
 
 	QString getInstallerCurrentFilePath() const;
 	QString getInstallerCurrentDirPath() const;
-	QString getInstallerOriginalFilePath() const;
-	QString getInstallerOriginalDirPath() const;
+	QString getInstallerInstalledFilePath() const;
+	QString getInstallerInstalledDirPath() const;
 
 	QString getInstallerMenuShortcutFullPath() const;
 	QString getInstallerDesktopShortcutFullPath() const;

code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp

@@ -727,13 +727,12 @@ void COperationDialog::copyInstaller()
 	QString destinationDirectory = config->getInstallationDirectory();
 
 	// rename old client to installer
-	QString newInstallerFilename = config->getInstallerFilename();
 
-	if (!newInstallerFilename.isEmpty())
-	{
 	QString oldInstallerFullPath = QApplication::applicationFilePath();
-		QString newInstallerFullPath = config->getInstallationDirectory() + "/" + newInstallerFilename;
+	QString newInstallerFullPath = config->getInstallerInstalledFilePath();
 
+	if (!newInstallerFullPath.isEmpty())
+	{
 		// always copy new installers
 		CFilesCopier copier(this);
 		copier.setIncludeFilter(config->getInstallerRequiredFiles());
@@ -931,13 +930,9 @@ bool COperationDialog::createAddRemoveEntry()
 {
 	CConfigFile *config = CConfigFile::getInstance();
 
-	QString newInstallerFilename = config->getInstallerFilename();
-
-	if (!newInstallerFilename.isEmpty())
-	{
-		QString newInstallerFullPath = config->getInstallationDirectory() + "/" + newInstallerFilename;
+	QString newInstallerFullPath = config->getInstallerInstalledFilePath();
 
-		if (QFile::exists(newInstallerFullPath))
+	if (!newInstallerFullPath.isEmpty() && QFile::exists(newInstallerFullPath))
 	{
 #ifdef Q_OS_WIN
 		QSettings settings("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ryzom", QSettings::NativeFormat);
@@ -961,7 +956,6 @@ bool COperationDialog::createAddRemoveEntry()
 		//	ModifyPath
 #endif
 	}
-	}
 
 	updateAddRemoveEntry();
 
@@ -974,14 +968,12 @@ bool COperationDialog::updateAddRemoveEntry()
 {
 	CConfigFile *config = CConfigFile::getInstance();
 
-	QString newInstallerFilename = config->getInstallerFilename();
+	QString newInstallerFullPath = config->getInstallerInstalledFilePath();
 
-	if (!newInstallerFilename.isEmpty())
+	if (!newInstallerFullPath.isEmpty() && QFile::exists(newInstallerFullPath))
 	{
-		QString newInstallerFullPath = config->getInstallationDirectory() + "/" + newInstallerFilename;
+		QString newInstallerFilename = config->getInstallerFilename();
 
-		if (QFile::exists(newInstallerFullPath))
-		{
 #ifdef Q_OS_WIN
 		QSettings settings("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ryzom", QSettings::NativeFormat);
 
@@ -995,7 +987,6 @@ bool COperationDialog::updateAddRemoveEntry()
 		settings.setValue("MinorVersion", versionTokens[1].toInt());
 #endif
 	}
-	}
 
 	return true;
 }
@@ -1161,7 +1152,7 @@ void COperationDialog::deleteComponentsInstaller()
 		dir.removeRecursively();
 	}
 
-	path = config->getInstallerOriginalDirPath();
+	path = config->getInstallerInstalledDirPath();
 	QStringList files = config->getInstallerRequiredFiles();
 
 	foreach(const QString &file, files)