[longomatch] Fix cameras config config after unloading events

[Andoni Morales Alastruey <amorales src gnome org>]

commit 354f47233e1b187a24f052ac36fb97b3ebdb774f
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Thu Apr 2 15:34:43 2015 +0200

    Fix cameras config config after unloading events

 LongoMatch.Services/Services/PlayerController.cs |    4 ++--
 Tests/Services/TestPlayerController.cs           |   12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/LongoMatch.Services/Services/PlayerController.cs 
b/LongoMatch.Services/Services/PlayerController.cs
index 8904455..236947c 100644
--- a/LongoMatch.Services/Services/PlayerController.cs
+++ b/LongoMatch.Services/Services/PlayerController.cs
@@ -484,12 +484,12 @@ namespace LongoMatch.Services
                {
                        Log.Debug ("Unload current event");
                        Reset ();
-                       UpdateCamerasConfig (defaultCamerasVisible, defaultCamerasLayout);
                        EmitEventUnloaded ();
                        if (FileSet != defaultFileSet) {
+                               UpdateCamerasConfig (defaultCamerasVisible, defaultCamerasLayout);
                                Open (defaultFileSet);
                        } else {
-                               ApplyCamerasConfig ();
+                               CamerasVisible = defaultCamerasVisible;
                        }
                }
 
diff --git a/Tests/Services/TestPlayerController.cs b/Tests/Services/TestPlayerController.cs
index 4285995..1d76110 100644
--- a/Tests/Services/TestPlayerController.cs
+++ b/Tests/Services/TestPlayerController.cs
@@ -568,6 +568,18 @@ namespace Tests.Services
                        Assert.AreEqual (0, elementLoaded);
                        // Check that cameras have been restored
                        Assert.AreEqual (new List<int> { 0, 1 }, player.CamerasVisible);
+
+                       /* Change again the cameras visible */
+                       player.CamerasVisible = new List<int>  { 2, 3 };
+                       Assert.AreEqual (evt.CamerasVisible, new List <int> { 0 });
+                       player.LoadEvent (mfs, evt, evt.Start, true);
+                       Assert.AreEqual (1, elementLoaded);
+                       Assert.AreEqual (evt.CamerasVisible, player.CamerasVisible);
+                       /* And unload */
+                       player.UnloadCurrentEvent ();
+                       Assert.AreEqual (0, elementLoaded);
+                       // Check that cameras have been restored
+                       Assert.AreEqual (new List<int> { 2, 3 }, player.CamerasVisible);
                }
 
                [Test ()]