diff --git a/Pilz.UI.WinForms.Telerik/Dialogs/RadFlyoutBase.cs b/Pilz.UI.WinForms.Telerik/Dialogs/RadFlyoutBase.cs index 1f3ec76..1b74cb8 100644 --- a/Pilz.UI.WinForms.Telerik/Dialogs/RadFlyoutBase.cs +++ b/Pilz.UI.WinForms.Telerik/Dialogs/RadFlyoutBase.cs @@ -113,11 +113,17 @@ public partial class RadFlyoutBase : UserControl protected RadFlyoutBase() { InitializeComponent(); + HandleCreated += RadFlyoutBase_HandleCreated; ParentChanged += FlyoutDialogBase_ParentChanged; bgWorker_LoadData.DoWork += BgWorker_LoadData_DoWork; bgWorker_LoadData.RunWorkerCompleted += BgWorker_LoadData_RunWorkerCompleted; } + private void RadFlyoutBase_HandleCreated(object? sender, EventArgs e) + { + + } + protected virtual void BgWorker_LoadData_DoWork(object? sender, DoWorkEventArgs e) { OnLoadData(e); @@ -125,7 +131,10 @@ public partial class RadFlyoutBase : UserControl protected virtual void BgWorker_LoadData_RunWorkerCompleted(object? sender, RunWorkerCompletedEventArgs e) { - OnLoadDataCompleted(e); + if (InvokeRequired) + BeginInvoke(() => OnLoadDataCompleted(e)); + else + OnLoadDataCompleted(e); } protected virtual void LoadData() diff --git a/Pilz.UI.WinForms.Telerik/Pilz.UI.WinForms.Telerik.csproj b/Pilz.UI.WinForms.Telerik/Pilz.UI.WinForms.Telerik.csproj index 840343a..a58400c 100644 --- a/Pilz.UI.WinForms.Telerik/Pilz.UI.WinForms.Telerik.csproj +++ b/Pilz.UI.WinForms.Telerik/Pilz.UI.WinForms.Telerik.csproj @@ -9,7 +9,7 @@ - 2.13.2 + 2.13.3 True