Changed: Created and used isDirectoryWritable() function

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

@@ -118,16 +118,7 @@ void CInstallDialog::accept()
 	if (succeedsToWrite)
 	{
 		// check if directory is writable by current user
-		QFile file(m_dstDirectory + "/writable_test_for_ryzom_installer.txt");
+		if (!isDirectoryWritable(m_dstDirectory))
-
-		if (file.open(QFile::WriteOnly))
-		{
-			file.close();
-
-			// remove it
-			file.remove();
-		}
-		else
 		{
 			succeedsToWrite = false;
 		}

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

@@ -133,16 +133,7 @@ void CMigrateDialog::accept()
 	if (succeedsToWrite)
 	{
 		// check if directory is writable by current user
-		QFile file(m_dstDirectory + "/writable_test_for_ryzom_installer.txt");
+		if (!isDirectoryWritable(m_dstDirectory))
-
-		if (file.open(QFile::WriteOnly))
-		{
-			file.close();
-
-			// remove it
-			file.remove();
-		}
-		else
 		{
 			succeedsToWrite = false;
 		}

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

@@ -102,6 +102,21 @@ bool isDirectoryEmpty(const QString &directory, bool recursize)
 	return res;
 }
 
+bool isDirectoryWritable(const QString &directory)
+{
+	// check if directory is writable by current user
+	QFile file(directory + "/writable_test_for_ryzom_installer.txt");
+
+	if (!file.open(QFile::WriteOnly)) return false;
+
+	file.close();
+
+	// remove it
+	file.remove();
+
+	return true;
+}
+
 qint64 getDirectorySize(const QString &directory, bool recursize)
 {
 	qint64 size = 0;

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

@@ -32,6 +32,7 @@ QString qBytesToHumanReadable(qint64 bytes);
 QString nameToId(const QString &name);
 
 bool isDirectoryEmpty(const QString &directory, bool recursize);
+bool isDirectoryWritable(const QString &directory);
 
 qint64 getDirectorySize(const QString &directory, bool recursize);