From 31b7c35bae6ee5aefaa539feefb4ac172dde77ff Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 4 Aug 2020 14:48:51 +0100
Subject: [PATCH] Fix logfiles not being deleted if captured application is the
 last user

* Previously only the UI itself would delete the log if it was the last thing to
  close.
---
 renderdoc/common/common.cpp | 4 ++--
 renderdoc/common/common.h   | 4 ++--
 renderdoc/core/core.cpp     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/renderdoc/common/common.cpp b/renderdoc/common/common.cpp
index 5bd0b5843..6220f4418 100644
--- a/renderdoc/common/common.cpp
+++ b/renderdoc/common/common.cpp
@@ -292,10 +292,10 @@ void rdclog_enableoutput()
   log_output_enabled = true;
 }
 
-void rdclog_closelog(const char *filename)
+void rdclog_closelog()
 {
   log_output_enabled = false;
-  FileIO::logfile_close(logfileHandle, filename);
+  FileIO::logfile_close(logfileHandle, logfile.c_str());
 }
 
 void rdclog_flush()
diff --git a/renderdoc/common/common.h b/renderdoc/common/common.h
index 219cff260..df82905b8 100644
--- a/renderdoc/common/common.h
+++ b/renderdoc/common/common.h
@@ -443,13 +443,13 @@ void rdclog_direct(time_t utcTime, uint32_t pid, LogType type, const char *proje
 const char *rdclog_getfilename();
 void rdclog_filename(const char *filename);
 void rdclog_enableoutput();
-void rdclog_closelog(const char *filename);
+void rdclog_closelog();
 
 #define RDCLOGFILE(fn) rdclog_filename(fn)
 #define RDCGETLOGFILE() rdclog_getfilename()
 
 #define RDCLOGOUTPUT() rdclog_enableoutput()
-#define RDCSTOPLOGGING(filename) rdclog_closelog(filename)
+#define RDCSTOPLOGGING() rdclog_closelog()
 
 #if(ENABLED(RDOC_DEVEL) || ENABLED(FORCE_DEBUG_LOGS)) && DISABLED(STRIP_DEBUG_LOGS)
 #define RDCDEBUG(...) rdclog(LogType::Debug, __VA_ARGS__)
diff --git a/renderdoc/core/core.cpp b/renderdoc/core/core.cpp
index 7a9a7fdfd..c5898750c 100644
--- a/renderdoc/core/core.cpp
+++ b/renderdoc/core/core.cpp
@@ -486,7 +486,7 @@ RenderDoc::~RenderDoc()
     }
   }
 
-  RDCSTOPLOGGING(m_LoggingFilename.c_str());
+  RDCSTOPLOGGING();
 
   if(m_RemoteThread)
   {