added more check for renderer overriding

AndreiMisiukevich · Apr 13, 2020 · 99ab860 · 99ab860
1 parent 4d30136
commit 99ab860
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Reloader/Xamarin.Forms.HotReload.Reloader/HotReloader.cs b/Reloader/Xamarin.Forms.HotReload.Reloader/HotReloader.cs
@@ -36,6 +36,7 @@ public sealed partial class HotReloader
 
         private VisualElement _ignoredElementInit;
 
+        private bool _codeReloadingEnabled;
         private Type _xamlLoaderType;
         Type XamlLoaderType => _xamlLoaderType ?? (_xamlLoaderType = Assembly.Load("Xamarin.Forms.Xaml").GetType("Xamarin.Forms.Xaml.XamlLoader"));
 
@@ -67,6 +68,7 @@ public ReloaderStartupInfo Run(Application app, Configuration config = null)
         {
             config = config ?? new Configuration();
             var devicePort = config.DeviceUrlPort;
+            _codeReloadingEnabled = config.CodeReloadingEnabled;
 
             Stop();
             App = app;
@@ -271,7 +273,7 @@ private void TrySubscribeRendererPropertyChanged(params string[] paths)
 
                     var hasCodegenAttribute = HasCodegenAttribute(bindable);
 
-                    if (!_assemblies.Contains(bindable.GetType().Assembly) && !hasCodegenAttribute)
+                    if ((!_assemblies.Contains(bindable.GetType().Assembly) || !_codeReloadingEnabled) && !hasCodegenAttribute)
                     {
                         return;
                     }