Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -969,8 +969,8 @@ namespace System.Windows.Forms
EnableFormsForModalLoop (toplevels, context);
if (context.MainForm != null && context.MainForm.IsHandleCreated) {
XplatUI.SetModal (context.MainForm.Handle, false);
if (old != null && old.IsHandleCreated) {
XplatUI.SetModal (old.Handle, false);
}
#if DebugRunLoop
Console.WriteLine (" Done with the SetModal");