lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 17:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow static logfile string to destruct before RenderDoc singleton

Browse Source
This commit is contained in:
baldurk
2020-09-12 23:18:04 +01:00
parent ac8a90ebbe
commit 76d91d5eef
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/common/common.cpp
+9 -8
View File
@@ -248,29 +248,30 @@ uint64_t Log2Floor(uint64_t value)
}
#endif
static rdcstr logfile;
// deliberately leak so it doesn't get destroyed before our static RenderDoc destructor needs it
static rdcstr *logfile = new rdcstr;
static FileIO::LogFileHandle *logfileHandle = NULL;
const char *rdclog_getfilename()
{
return logfile.c_str();
return logfile->c_str();
}
void rdclog_filename(const char *filename)
{
rdcstr previous = logfile;
rdcstr previous = *logfile;
logfile = "";
*logfile = "";
if(filename && filename[0])
logfile = filename;
*logfile = filename;
FileIO::logfile_close(logfileHandle, NULL);
logfileHandle = NULL;
if(!logfile.empty())
if(!logfile->empty())
{
logfileHandle = FileIO::logfile_open(logfile.c_str());
logfileHandle = FileIO::logfile_open(logfile->c_str());
if(logfileHandle && previous.c_str())
{
@@ -295,7 +296,7 @@ void rdclog_enableoutput()
void rdclog_closelog()
{
log_output_enabled = false;
FileIO::logfile_close(logfileHandle, logfile.c_str());
FileIO::logfile_close(logfileHandle, logfile->c_str());
}
void rdclog_flush()