Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -382,11 +382,12 @@ void DebugCallStack::LogExceptionInfo(EXCEPTION_POINTERS* pex)
    string path("");
    if ((gEnv) && (gEnv->pFileIO))
    {
-        const char* logAlias = nullptr;
-        if (
-            (logAlias = gEnv->pFileIO->GetAlias("@log@")) ||
-            (logAlias = gEnv->pFileIO->GetAlias("@root@"))
-            )
+        const char* logAlias = gEnv->pFileIO->GetAlias("@log@");
+        if (!logAlias)
+        {
+            logAlias = gEnv->pFileIO->GetAlias("@root@");
+        }
+        if (logAlias)
        {
            path = logAlias;
            path += "/";