From d163cde51e6ae9e8e319e6944bbef167334c90c4 Mon Sep 17 00:00:00 2001
From: Guillaume Dupuy <glorf@glorf.fr>
Date: Sat, 15 Jul 2017 12:14:33 +0200
Subject: [PATCH] Fix ignoreFreeDiskSpaceChecks() usage

Now actually ignore free space, instead of creating an error and refusing to go further everytime

--HG--
branch : fix_freespace_check
---
 code/ryzom/tools/client/ryzom_installer/src/downloader.cpp | 7 ++++---
 .../tools/client/ryzom_installer/src/migratedialog.cpp     | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp b/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp
index 81fc7ecd3..fd034aebf 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp
@@ -180,9 +180,10 @@ void CDownloader::getFileHead()
 
 void CDownloader::downloadFile()
 {
-	qint64 freeSpace = CConfigFile::getInstance()->ignoreFreeDiskSpaceChecks() ? 0:NLMISC::CSystemInfo::availableHDSpace(m_fullPath.toUtf8().constData());
+	bool ignoreFreeDiskSpaceChecks =  CConfigFile::getInstance()->ignoreFreeDiskSpaceChecks();
+	qint64 freeSpace = NLMISC::CSystemInfo::availableHDSpace(m_fullPath.toUtf8().constData());
 
-	if (freeSpace == 0)
+	if (!ignoreFreeDiskSpaceChecks && freeSpace == 0)
 	{
 		if (m_listener)
 		{
@@ -192,7 +193,7 @@ void CDownloader::downloadFile()
 		return;
 	}
 
-	if (freeSpace < m_size - m_offset)
+	if (!ignoreFreeDiskSpaceChecks && freeSpace < m_size - m_offset)
 	{
 		// we have not enough free disk space to continue download
 		if (m_listener) m_listener->operationFail(tr("You only have %1 bytes left on the device, but %2 bytes are needed.").arg(freeSpace).arg(m_size - m_offset));
diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
index d246701ea..99a2194f7 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
@@ -123,10 +123,11 @@ void CMigrateDialog::updateDestinationText()
 void CMigrateDialog::accept()
 {
 	// check free disk space
-	qint64 freeSpace = CConfigFile::getInstance()->ignoreFreeDiskSpaceChecks() ? 0:NLMISC::CSystemInfo::availableHDSpace(m_dstDirectory.toUtf8().constData());
+	bool ignoreFreeDiskSpaceChecks = CConfigFile::getInstance()->ignoreFreeDiskSpaceChecks();
+	qint64 freeSpace = NLMISC::CSystemInfo::availableHDSpace(m_dstDirectory.toUtf8().constData());
 
 	// shouldn't happen
-	if (freeSpace == 0)
+	if (!ignoreFreeDiskSpaceChecks && freeSpace == 0)
 	{
 		int error = NLMISC::getLastError();
 
@@ -134,7 +135,7 @@ void CMigrateDialog::accept()
 	}
 
 	// compare with exact size of current directory
-	if (freeSpace && freeSpace < getDirectorySize(m_currentDirectory, true))
+	if (!ignoreFreeDiskSpaceChecks && freeSpace && freeSpace < getDirectorySize(m_currentDirectory, true))
 	{
 		QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Not enough free disk space"), tr("You don't have enough free space on this disk, please make more space or choose a directory on another disk."));
 		return;