From c90c2fab0f9eb1be8a8dd8821571009ee2102fd7 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Fri, 8 Dec 2017 22:41:14 +0100 Subject: [PATCH] Fixed a regression in output file name generation. --- src/Thread_Process.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Thread_Process.cpp b/src/Thread_Process.cpp index e6e33f7e..f39eb305 100644 --- a/src/Thread_Process.cpp +++ b/src/Thread_Process.cpp @@ -497,13 +497,13 @@ int ProcessThread::generateOutFileName(QString &outFileName) } //Generate final name - for (int n = 2; n <= 99999; ++n) + const QFileInfo origFileName(outFileName); + for (int n = 2; n <= 65534; ++n) { //Check file existence - QFileInfo outFileInfo(outFileName); - if (outFileInfo.exists()) + if (QFileInfo(outFileName).exists()) { - outFileName = QString("%1/%2 (%3).%4").arg(outFileInfo.canonicalPath(), outFileInfo.completeBaseName(), QString::number(n), outFileInfo.suffix()); + outFileName = origFileName.absoluteDir().filePath(QString("%1 (%2).%3").arg(origFileName.completeBaseName(), QString::number(n), origFileName.suffix())); continue; }