From: Bellai Ádám Date: Thu, 19 Oct 2017 06:53:47 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=af32d6ec3cff4dece5ec7708d04f78a8a0fa8b27;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30647 --- diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs index c143232b..f1b32cd7 100644 --- a/client/Maestro/MaestroForm.cs +++ b/client/Maestro/MaestroForm.cs @@ -193,9 +193,10 @@ namespace Maestro { private void SetOctopusIDToMetadataText() { OctopusAPI api = octopusIDSelector.GetClient(); - IEnumerable stories = api.GetStoriesById(startingName); Cursor.Current = Cursors.WaitCursor; + IEnumerable stories = api.GetStoriesById(startingName); ProcessOctopusResult(stories, api); + Cursor.Current = Cursors.Default; } private void ProcessOctopusResult(IEnumerable stories, OctopusAPI api) { @@ -248,6 +249,7 @@ namespace Maestro { else if (startingName.StartsWith("R")) result = api.GetAdvertisements(startingName); ProcessMamResults(result); + Cursor.Current = Cursors.Default; } private void ProcessMamResults(List result) { diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs index 24c7d9df..4b8ba9a4 100644 --- a/client/OctopusClient/OctopusIDSelector.cs +++ b/client/OctopusClient/OctopusIDSelector.cs @@ -100,17 +100,21 @@ namespace OctopusClient { IEnumerable rundowns = client.GetRundowns(dateScheduled.Value)?.ToArray(); if (rundowns == null) { bindingRundown.Remove(Resources.VALASSZON_ELEMET); + Cursor.Current = Cursors.Default; return; } BindingList bindingRundowns = new BindingList(); bindingRundowns.Add(new Rundown() { ID = 0.ToString(), Name = Resources.VALASSZON_ELEMET }); - if (rundowns == null) + if (rundowns == null) { + Cursor.Current = Cursors.Default; return; + } foreach (Rundown actualRundown in rundowns) bindingRundowns.Add(actualRundown); bindingRundown.DataSource = bindingRundowns; comboRudowns.SelectedIndex = selectedRundownIndex == -1 ? 0 : selectedRundownIndex; InitCheckID(treeContent.Nodes); + Cursor.Current = Cursors.Default; } private void refreshStoryFolders() { diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 4b3d2ace..b96c10bb 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -96,6 +96,7 @@ namespace TrafficClient { result = trafficAPI.GetPromotionals(searchText)?.ToArray(); if (result == null) { dataGridView1.DataSource = null; + Cursor.Current = Cursors.Default; return; } List list = new List(); @@ -105,6 +106,7 @@ namespace TrafficClient { list.Sort((x, y) => DateTime.Compare(x.NextBroadcastDate.Value, y.NextBroadcastDate.Value)); dataGridView1.DataSource = list; SetColumnsToResizeable(); + Cursor.Current = Cursors.Default; } private bool CanSort(List list) {