aboutsummaryrefslogtreecommitdiff
path: root/src/qt/intro.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qt/intro.cpp')
-rw-r--r--src/qt/intro.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index 51f3c812e4..99db141c94 100644
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -25,6 +25,7 @@ static const uint64 BLOCK_CHAIN_SIZE = 10LL * GB_BYTES;
class FreespaceChecker : public QObject
{
Q_OBJECT
+
public:
FreespaceChecker(Intro *intro);
@@ -61,9 +62,16 @@ void FreespaceChecker::check()
/* Find first parent that exists, so that fs::space does not fail */
fs::path parentDir = dataDir;
+ fs::path parentDirOld = fs::path();
while(parentDir.has_parent_path() && !fs::exists(parentDir))
{
parentDir = parentDir.parent_path();
+
+ /* Check if we make any progress, break if not to prevent an infinite loop here */
+ if (parentDirOld == parentDir)
+ break;
+
+ parentDirOld = parentDir;
}
try {
@@ -72,9 +80,9 @@ void FreespaceChecker::check()
{
if(fs::is_directory(dataDir))
{
- QString separator = QDir::toNativeSeparators("/");
+ QString separator = "<code>" + QDir::toNativeSeparators("/") + tr("name") + "</code>";
replyStatus = ST_OK;
- replyMessage = tr("Directory already exists. Add <code>%1name</code> if you intend to create a new directory here.").arg(separator);
+ replyMessage = tr("Directory already exists. Add %1 if you intend to create a new directory here.").arg(separator);
} else {
replyStatus = ST_ERROR;
replyMessage = tr("Path already exists, and is not a directory.");
@@ -201,7 +209,7 @@ void Intro::setStatus(int status, const QString &message, quint64 bytesAvailable
} else {
ui->freeSpace->setStyleSheet("");
}
- ui->freeSpace->setText(freeString+".");
+ ui->freeSpace->setText(freeString + ".");
}
/* Don't allow confirm in ERROR state */
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(status != FreespaceChecker::ST_ERROR);