1.1 --- a/Server/FormMain.cs	Fri Aug 12 20:25:05 2016 +0200
     1.2 +++ b/Server/FormMain.cs	Sat Aug 13 23:26:54 2016 +0200
     1.3 @@ -141,12 +141,12 @@
     1.4  
     1.5          public FormMain()
     1.6          {
     1.7 -            ManagerEventAction.Current = Properties.Settings.Default.Actions;
     1.8 +            ManagerEventAction.Current = Properties.Settings.Default.Events;
     1.9              if (ManagerEventAction.Current == null)
    1.10              {
    1.11                  //No actions in our settings yet
    1.12                  ManagerEventAction.Current = new ManagerEventAction();
    1.13 -                Properties.Settings.Default.Actions = ManagerEventAction.Current;
    1.14 +                Properties.Settings.Default.Events = ManagerEventAction.Current;
    1.15              }
    1.16              else
    1.17              {
    1.18 @@ -2813,7 +2813,7 @@
    1.19              if (res == DialogResult.OK)
    1.20              {
    1.21                  selectedEvent.Actions.Add(ea.Object);
    1.22 -                Properties.Settings.Default.Actions = ManagerEventAction.Current;
    1.23 +                Properties.Settings.Default.Events = ManagerEventAction.Current;
    1.24                  Properties.Settings.Default.Save();
    1.25                  PopulateEventsTreeView();
    1.26              }
    1.27 @@ -2844,7 +2844,7 @@
    1.28                  //Update our action
    1.29                  selectedEvent.Actions[actionIndex]=ea.Object;
    1.30                  //Save and rebuild our event tree view
    1.31 -                Properties.Settings.Default.Actions = ManagerEventAction.Current;
    1.32 +                Properties.Settings.Default.Events = ManagerEventAction.Current;
    1.33                  Properties.Settings.Default.Save();
    1.34                  PopulateEventsTreeView();
    1.35              }
    1.36 @@ -2866,7 +2866,7 @@
    1.37              }
    1.38  
    1.39              ManagerEventAction.Current.RemoveAction(action);
    1.40 -            Properties.Settings.Default.Actions = ManagerEventAction.Current;
    1.41 +            Properties.Settings.Default.Events = ManagerEventAction.Current;
    1.42              Properties.Settings.Default.Save();
    1.43              PopulateEventsTreeView();
    1.44          }
    1.45 @@ -2910,7 +2910,7 @@
    1.46              currentEvent.Actions[currentIndex-1] = movingUp;
    1.47  
    1.48              //Save and populate our tree again
    1.49 -            Properties.Settings.Default.Actions = ManagerEventAction.Current;
    1.50 +            Properties.Settings.Default.Events = ManagerEventAction.Current;
    1.51              Properties.Settings.Default.Save();
    1.52              PopulateEventsTreeView();
    1.53  
    1.54 @@ -2940,7 +2940,7 @@
    1.55              currentEvent.Actions[currentIndex + 1] = movingDown;
    1.56  
    1.57              //Save and populate our tree again
    1.58 -            Properties.Settings.Default.Actions = ManagerEventAction.Current;
    1.59 +            Properties.Settings.Default.Events = ManagerEventAction.Current;
    1.60              Properties.Settings.Default.Save();
    1.61              PopulateEventsTreeView();
    1.62          }
    1.63 @@ -3011,7 +3011,7 @@
    1.64              if (res == DialogResult.OK)
    1.65              {
    1.66                  ManagerEventAction.Current.Events.Add(ea.Object);
    1.67 -                Properties.Settings.Default.Actions = ManagerEventAction.Current;
    1.68 +                Properties.Settings.Default.Events = ManagerEventAction.Current;
    1.69                  Properties.Settings.Default.Save();
    1.70                  PopulateEventsTreeView();
    1.71                  SelectEvent(ea.Object);
    1.72 @@ -3028,7 +3028,7 @@
    1.73              }
    1.74  
    1.75              ManagerEventAction.Current.Events.Remove(currentEvent);
    1.76 -            Properties.Settings.Default.Actions = ManagerEventAction.Current;
    1.77 +            Properties.Settings.Default.Events = ManagerEventAction.Current;
    1.78              Properties.Settings.Default.Save();
    1.79              PopulateEventsTreeView();
    1.80          }
    1.81 @@ -3050,7 +3050,7 @@
    1.82              if (res == DialogResult.OK)
    1.83              {
    1.84                  //Save and rebuild our event tree view
    1.85 -                Properties.Settings.Default.Actions = ManagerEventAction.Current;
    1.86 +                Properties.Settings.Default.Events = ManagerEventAction.Current;
    1.87                  Properties.Settings.Default.Save();
    1.88                  PopulateEventsTreeView();
    1.89              }