Listen to UserMessage only if caller requires it. This should reduce issues when switching users with different skins. Currently MP2 still crashes

Author: morpheusxx

MediaPortal/Source/Core/MediaPortal.Common/Services/Settings/SettingsChangeWatcher.cs

@@ -23,6 +23,8 @@ You should have received a copy of the GNU General Public License
 #endregion
 
 using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using MediaPortal.Common.Messaging;
 using MediaPortal.Common.Settings;
 using MediaPortal.Common.UserManagement;
@@ -45,8 +47,14 @@ public class SettingsChangeWatcher<T> : IDisposable
     #endregion
 
     public SettingsChangeWatcher()
+      : this(false) { }
+
+    public SettingsChangeWatcher(bool updateOnUserChange)
     {
-      _messageQueue = new AsynchronousMessageQueue(this, new string[] { SettingsManagerMessaging.CHANNEL, UserMessaging.CHANNEL });
+      List<string> channels = new List<string> { SettingsManagerMessaging.CHANNEL };
+      if (updateOnUserChange)
+        channels.Add(UserMessaging.CHANNEL);
+      _messageQueue = new AsynchronousMessageQueue(this, channels);
       _messageQueue.MessageReceived += OnMessageReceived;
       _messageQueue.Start();
     }
@@ -67,6 +75,14 @@ public T Settings
       }
     }
 
+    /// <summary>
+    /// Refreshes the settings asynchronously.
+    /// </summary>
+    public void RefreshAsync()
+    {
+      Task.Run(() => Refresh());
+    }
+
     /// <summary>
     /// Forces the refresh of the settings.
     /// </summary>
@@ -88,7 +104,7 @@ protected void OnMessageReceived(AsynchronousMessageQueue queue, SystemMessage m
         {
           // If the user has been changed, refresh the settings in every case.
           case UserMessaging.MessageType.UserChanged:
-            Refresh();
+            RefreshAsync();
             break;
         }
       }

MediaPortal/Source/UI/Players/RefreshRateChanger/VideoFpsWatcher.cs

@@ -44,7 +44,7 @@ public class VideoFpsWatcher : IPluginStateTracker, IDisposable
     protected Timer _timer;
     protected object _syncObj = new object();
     protected bool _isEnabled;
-    protected SettingsChangeWatcher<RefreshRateChangerSettings> _settings = new SettingsChangeWatcher<RefreshRateChangerSettings>();
+    protected SettingsChangeWatcher<RefreshRateChangerSettings> _settings = new SettingsChangeWatcher<RefreshRateChangerSettings>(true);
 
     public VideoFpsWatcher()
     {

MediaPortal/Source/UI/Players/VideoEffectChanger/VideoEffectChanger.cs

@@ -39,7 +39,7 @@ public class VideoEffectChanger
     private double DEFAULT_CHECK_INTERVAL = 1000;
 
     private AsynchronousMessageQueue _messageQueue;
-    private readonly SettingsChangeWatcher<VideoEffectChangerSettings> _settings = new SettingsChangeWatcher<VideoEffectChangerSettings>();
+    private readonly SettingsChangeWatcher<VideoEffectChangerSettings> _settings = new SettingsChangeWatcher<VideoEffectChangerSettings>(true);
     private Timer _timer;
 
     public VideoEffectChanger()

MediaPortal/Source/UI/SkinEngine/Controls/Visuals/Triggers/SoundPlayerAction.cs

@@ -102,7 +102,13 @@ public override void Execute(UIElement element)
           .Any(player => player is IAudioPlayer || player is IVideoPlayer))
           return;
       }
-      using (SoundPlayer simpleSound = new SoundPlayer(SkinContext.SkinResources.GetResourceFilePath(SkinResources.SOUNDS_DIRECTORY + "\\" + source)))
+
+      // The path can only be null during skin switching
+      var resourceFilePath = SkinContext.SkinResources.GetResourceFilePath(SkinResources.SOUNDS_DIRECTORY + "\\" + source);
+      if (resourceFilePath == null)
+        return;
+
+      using (SoundPlayer simpleSound = new SoundPlayer(resourceFilePath))
         simpleSound.Play();
     }
   }

MediaPortal/Source/UI/TV/SlimTvClient/Models/SlimTvGuideModelBase.cs

@@ -422,7 +422,7 @@ void InitSettingsWatcher()
     {
       if (_settings != null)
         return;
-      _settings = new SettingsChangeWatcher<SlimTvClientSettings>();
+      _settings = new SettingsChangeWatcher<SlimTvClientSettings>(true);
       UpdatePropertiesFromSettings(_settings.Settings);
       _settings.SettingsChanged = OnSettingsChanged;
     }

MediaPortal/Source/UI/UiComponents/News/Models/NewsModel.cs

@@ -175,7 +175,7 @@ public void Deactivate(NavigationContext oldContext, NavigationContext newContex
 
     public void Reactivate(NavigationContext oldContext, NavigationContext newContext)
     {
-      GetFeeds();
+      // Nothing to do here
     }
 
     public void UpdateMenuActions(NavigationContext context, IDictionary<Guid, WorkflowAction> actions)

MediaPortal/Source/UI/UiComponents/News/NewsCollector.cs

@@ -45,7 +45,7 @@ class NewsCollector : INewsCollector
     protected NewsItem _lastRandomNewsItem = null;
     protected List<NewsFeed> _feeds = new List<NewsFeed>();
     protected bool _refeshInProgress = false;
-    protected SettingsChangeWatcher<NewsSettings> _settings = new SettingsChangeWatcher<NewsSettings>();
+    protected SettingsChangeWatcher<NewsSettings> _settings = new SettingsChangeWatcher<NewsSettings>(true);
     IntervalWork _work = null;
 
     public NewsCollector()

MediaPortal/Source/UI/UiComponents/Weather/Grabbers/OpenWeatherMap.cs

@@ -58,7 +58,7 @@ public class OpenWeatherMapCatcher : IWeatherCatcher, IApiToken, IDisposable
     private SemaphoreSlim _lock = new SemaphoreSlim(1, 1);
     private Dictionary<int, Tuple<City, DateTime>> _cache = new Dictionary<int, Tuple<City, DateTime>>();
     private TimeSpan MAX_CACHE_DURATION = TimeSpan.FromMinutes(30);
-    private SettingsChangeWatcher<WeatherSettings> _settings = new SettingsChangeWatcher<WeatherSettings>();
+    private SettingsChangeWatcher<WeatherSettings> _settings = new SettingsChangeWatcher<WeatherSettings>(true);
 
     public OpenWeatherMapCatcher()
     {

MediaPortal/Source/UI/UiComponents/Weather/Models/CurrentWeatherModel.cs

@@ -45,7 +45,7 @@ public class CurrentWeatherModel : BaseTimerControlledModel
     /// </summary>
     private const int WEATHER_UPDATE_INTERVAL = 30 * 60 * 1000;
 
-    protected readonly SettingsChangeWatcher<WeatherSettings> _settings = new SettingsChangeWatcher<WeatherSettings>();
+    protected readonly SettingsChangeWatcher<WeatherSettings> _settings = new SettingsChangeWatcher<WeatherSettings>(true);
 
     protected readonly AbstractProperty _currentLocationProperty = new WProperty(typeof(City), City.NoData);