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

SkeinUE: Fixed 'resolve conflicts' button becoming unresponsive.

Browse Source 
What happened? The FSuppressableWarningDialog::ShowModal() function returns SUPPRESSED if the dialog is not shown. This should be treated the same as CONFIRM (in most cases) but it was treated the same as CANCEL.

#rb Marco.Anastasi
#rnx

[CL 30527635 by wouter burgers in ue5-main branch]
This commit is contained in:
wouter burgers
2024-01-10 05:11:18 -05:00
parent 9c84a0b9aa
commit 8f355cef23
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Engine/Source/Developer/SourceControlCheckInPrompt/Private/SourceControlCheckInPromptModule.cpp
View File

@@ -59,7 +59,7 @@ void FSourceControlCheckInPromptModule::ShowModal(const FText& InMessage)
Info.Image = const_cast<FSlateBrush*>(FRevisionControlStyleManager::Get().GetBrush("RevisionControl.StatusBar.HasLocalChanges"));
FSuppressableWarningDialog CheckInWarning(Info);
if (CheckInWarning.ShowModal() == FSuppressableWarningDialog::Confirm)
if (CheckInWarning.ShowModal() != FSuppressableWarningDialog::Cancel)
{
FSourceControlWindows::ChoosePackagesToCheckIn();
}