Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008

#rb
#rnx
#lockdown Nick.Penwarden

[CL 4395058 by Marc Audy in Main branch]
This commit is contained in:
Marc Audy
2018-09-25 10:11:35 -04:00
parent 0151b9d207
commit af90b7bcd4
2171 changed files with 131372 additions and 43232 deletions

View File

@@ -1491,7 +1491,7 @@ void SSlateFileOpenDlg::ParseFilters()
if (FilterNameArray.Num() == 0)
{
TCHAR Temp[MAX_FILTER_LENGTH];
FCString::Strcpy(Temp, Filters.Len(), *Filters);
FCString::Strcpy(Temp, ARRAY_COUNT(Temp), *Filters);
// break path into tokens
TCHAR *ContextStr = nullptr;
@@ -1535,7 +1535,7 @@ bool SSlateFileOpenDlg::GetFilterExtension(FString &OutString)
// make a copy of filter string that we can modify
TCHAR Temp[MAX_FILTER_LENGTH];
FCString::Strcpy(Temp, FilterNameArray[FilterIndex]->Len(), *(*FilterNameArray[FilterIndex].Get()));
FCString::Strcpy(Temp, ARRAY_COUNT(Temp), *(*FilterNameArray[FilterIndex].Get()));
// find start of extension
TCHAR *FilterExt = FCString::Strchr(Temp, '.');