Merge branch '2.3' into 2.4

This commit is contained in:
Johan Wikman
2020-08-19 16:37:52 +03:00

View File

@ -1422,6 +1422,8 @@ public:
void update_names_from_srclist(QcAliases* pAliases, void update_names_from_srclist(QcAliases* pAliases,
const SrcList* pSrc) const SrcList* pSrc)
{
if (pSrc) // TODO: Figure out in what contexts pSrc can be NULL.
{ {
for (int i = 0; i < pSrc->nSrc; ++i) for (int i = 0; i < pSrc->nSrc; ++i)
{ {
@ -1436,6 +1438,7 @@ public:
} }
} }
} }
}
static void update_function_fields(const QcAliases* pAliases, static void update_function_fields(const QcAliases* pAliases,
const char* zDatabase, const char* zDatabase,