izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Guard against source control crashes if a provider becomes null

Browse Source 
[CL 2584035 by Matt Kuhlenschmidt in Main branch]
This commit is contained in:
Matt Kuhlenschmidt
2015-06-11 08:24:31 -04:00
committed by matt.kuhlenschmidt@epicgames.com
parent 8ccf20c0b2
commit e45a27eb40
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Engine/Source/Developer/SourceControl/Private/SourceControlModule.cpp
View File

@@ -214,35 +214,38 @@ void FSourceControlModule::InitializeSourceControlProviders()
void FSourceControlModule::Tick()
{
ISourceControlProvider& Provider = GetProvider();
// tick the provider, so any operation results can be read back
Provider.Tick();
// don't allow background status updates when temporarily disabled for login
if(!bTemporarilyDisabled)
if( CurrentSourceControlProvider != nullptr )
{
// check for any pending dispatches
if(PendingStatusUpdateFiles.Num() > 0)
ISourceControlProvider& Provider = GetProvider();
// tick the provider, so any operation results can be read back
Provider.Tick();
// don't allow background status updates when temporarily disabled for login
if(!bTemporarilyDisabled)
{
// grab a batch of files
TArray<FString> FilesToDispatch;
for(auto Iter(PendingStatusUpdateFiles.CreateConstIterator()); Iter; Iter++)
// check for any pending dispatches
if(PendingStatusUpdateFiles.Num() > 0)
{
if(FilesToDispatch.Num() >= SourceControlConstants::MaxStatusDispatchesPerTick)
// grab a batch of files
TArray<FString> FilesToDispatch;
for(auto Iter(PendingStatusUpdateFiles.CreateConstIterator()); Iter; Iter++)
{
break;
if(FilesToDispatch.Num() >= SourceControlConstants::MaxStatusDispatchesPerTick)
{
break;
}
FilesToDispatch.Add(*Iter);
}
FilesToDispatch.Add(*Iter);
}
if(FilesToDispatch.Num() > 0)
{
// remove the files we are dispatching so we don't try again
PendingStatusUpdateFiles.RemoveAt(0, FilesToDispatch.Num());
if(FilesToDispatch.Num() > 0)
{
// remove the files we are dispatching so we don't try again
PendingStatusUpdateFiles.RemoveAt(0, FilesToDispatch.Num());
// dispatch update
Provider.Execute(ISourceControlOperation::Create<FUpdateStatus>(), FilesToDispatch, EConcurrency::Asynchronous);
// dispatch update
Provider.Execute(ISourceControlOperation::Create<FUpdateStatus>(), FilesToDispatch, EConcurrency::Asynchronous);
}
}
}
}