Skip to content

Commit dd56909

Browse files
committed
Files stayed in RTF directory
In Delay removing files in case of RTF till end of process (#10794 ) the removal of files of a successful RTF merge was handled though when e.g.: ``` RTF_OUTPUT = ./rtf ``` the files remained as the match didn't succeed, it is better to use the current directory (as here and in its subdirectories all files are located).
1 parent 3ce1c91 commit dd56909

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/rtfgen.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2398,7 +2398,6 @@ void testRTFOutput(const QCString &name)
23982398
bool RTFGenerator::preProcessFileInplace(const QCString &path,const QCString &name)
23992399
{
24002400
static bool rtfDebug = Debug::isFlagSet(Debug::Rtf);
2401-
QCString rtfOutput = Config_getString(RTF_OUTPUT);
24022401

24032402
Dir d(path.str());
24042403
// store the original directory
@@ -2450,10 +2449,11 @@ bool RTFGenerator::preProcessFileInplace(const QCString &path,const QCString &na
24502449

24512450
testRTFOutput(mainRTFName);
24522451

2452+
QCString rtfOutputDir = Dir::currentDirPath();
24532453
for (auto &s : removeSet)
24542454
{
24552455
QCString s1(s.c_str());
2456-
if (s1.startsWith(rtfOutput)) Portable::unlink(s1);
2456+
if (s1.startsWith(rtfOutputDir)) Portable::unlink(s1);
24572457
}
24582458

24592459
Dir::setCurrent(oldDir);

0 commit comments

Comments
 (0)