git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index c143232bcfd8d753178c3e81d491fca58b9e06f1..f1b32cd77ee0fd5195efa701963df7967aaf9d59 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -193,9 +193,10 @@ namespace Maestro {
 \r
         private void SetOctopusIDToMetadataText() {\r
             OctopusAPI api = octopusIDSelector.GetClient();\r
-            IEnumerable<Story> stories = api.GetStoriesById(startingName);\r
             Cursor.Current = Cursors.WaitCursor;\r
+            IEnumerable<Story> stories = api.GetStoriesById(startingName);\r
             ProcessOctopusResult(stories, api);\r
+            Cursor.Current = Cursors.Default;\r
         }\r
 \r
         private void ProcessOctopusResult(IEnumerable<Story> stories, OctopusAPI api) {\r
@@ -248,6 +249,7 @@ namespace Maestro {
             else if (startingName.StartsWith("R"))\r
                 result = api.GetAdvertisements(startingName);\r
             ProcessMamResults(result);\r
+            Cursor.Current = Cursors.Default;\r
         }\r
 \r
         private void ProcessMamResults(List<MamResultWrapper> result) {\r

diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs
index 24c7d9df0dfb401f0e54ba3447898a87ccf6a252..4b8ba9a46e5072115766bb4f2e076afddcde1ebe 100644 (file)
--- a/client/OctopusClient/OctopusIDSelector.cs
+++ b/client/OctopusClient/OctopusIDSelector.cs
@@ -100,17 +100,21 @@ namespace OctopusClient {
             IEnumerable<Rundown> rundowns = client.GetRundowns(dateScheduled.Value)?.ToArray();\r
             if (rundowns == null) {\r
                 bindingRundown.Remove(Resources.VALASSZON_ELEMET);\r
+                Cursor.Current = Cursors.Default;\r
                 return;\r
             }\r
             BindingList<Rundown> bindingRundowns = new BindingList<Rundown>();\r
             bindingRundowns.Add(new Rundown() { ID = 0.ToString(), Name = Resources.VALASSZON_ELEMET });\r
-            if (rundowns == null)\r
+            if (rundowns == null) {\r
+                Cursor.Current = Cursors.Default;\r
                 return;\r
+            }\r
             foreach (Rundown actualRundown in rundowns)\r
                 bindingRundowns.Add(actualRundown);\r
             bindingRundown.DataSource = bindingRundowns;\r
             comboRudowns.SelectedIndex = selectedRundownIndex == -1 ? 0 : selectedRundownIndex;\r
             InitCheckID(treeContent.Nodes);\r
+            Cursor.Current = Cursors.Default;\r
         }\r
 \r
         private void refreshStoryFolders() {\r

diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index 4b3d2aceb04285b01fdf71744a53c1a473e63677..b96c10bbb9fed1830918568aec27231c1838a601 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -96,6 +96,7 @@ namespace TrafficClient {
                 result = trafficAPI.GetPromotionals(searchText)?.ToArray();\r
             if (result == null) {\r
                 dataGridView1.DataSource = null;\r
+                Cursor.Current = Cursors.Default;\r
                 return;\r
             }\r
             List<MamResultWrapper> list = new List<MamResultWrapper>();\r
@@ -105,6 +106,7 @@ namespace TrafficClient {
                 list.Sort((x, y) => DateTime.Compare(x.NextBroadcastDate.Value, y.NextBroadcastDate.Value));\r
             dataGridView1.DataSource = list;\r
             SetColumnsToResizeable();\r
+            Cursor.Current = Cursors.Default;\r
         }\r
 \r
         private bool CanSort(List<MamResultWrapper> list) {\r