diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp
index b6f83f34b..32d1de4ae 100644
--- a/qrenderdoc/Code/CaptureContext.cpp
+++ b/qrenderdoc/Code/CaptureContext.cpp
@@ -82,6 +82,19 @@ QString CaptureContext::ConfigFile(const QString &filename)
   return QDir::cleanPath(dir.absoluteFilePath(filename));
 }
 
+QString CaptureContext::TempLogFilename(QString appname)
+{
+  QString folder = Config.TemporaryCaptureDirectory;
+
+  QDir dir(folder);
+
+  if(folder == "" || !dir.exists())
+    folder = QDir::tempPath();
+
+  return dir.absoluteFilePath(
+      appname + "_" + QDateTime::currentDateTimeUtc().toString("yyyy.MM.dd_HH.mm.ss") + ".rdc");
+}
+
 void CaptureContext::LoadLogfile(const QString &logFile, const QString &origFilename,
                                  bool temporary, bool local)
 {
diff --git a/qrenderdoc/Code/CaptureContext.h b/qrenderdoc/Code/CaptureContext.h
index 7a0e01666..cced3a097 100644
--- a/qrenderdoc/Code/CaptureContext.h
+++ b/qrenderdoc/Code/CaptureContext.h
@@ -68,7 +68,7 @@ public:
 
   static QString ConfigFile(const QString &filename);
 
-  static QString TempLogFilename(QString appname);
+  QString TempLogFilename(QString appname);
 
   //////////////////////////////////////////////////////////////////////////////
   // Control functions