Merge branch 'development' into distro_haxedevelop

Author: Meychi

External/Plugins/StartPage/PluginMain.cs

@@ -12,7 +12,6 @@
 using ProjectManager;
 using StartPage.Controls;
 using WeifenLuo.WinFormsUI.Docking;
-using Microsoft.Win32;
 
 namespace StartPage
 {
@@ -102,7 +101,6 @@ public void Initialize()
             this.InitBasics();
             this.LoadSettings();
             this.AddEventHandlers();
-            this.UseLatestBrowserControl();
             this.CreateMenuItem();
         }
 
@@ -199,24 +197,6 @@ public void AddEventHandlers()
             EventManager.AddEventHandler(this, EventType.RestoreSession);
         }
 
-        /// <summary>
-        /// Sets a key in registry so that latest .NET browser control is used
-        /// </summary>
-        private void UseLatestBrowserControl()
-        {
-            try
-            {
-                String valueName = DistroConfig.DISTRIBUTION_NAME + ".exe";
-                String subKey = "Software\\Microsoft\\Internet Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION\\";
-                RegistryKey emu = Registry.CurrentUser.OpenSubKey(subKey, true);
-                {
-                    Object value = emu.GetValue(valueName);
-                    if (value == null) emu.SetValue(valueName, 0, RegistryValueKind.DWord);
-                }
-            }
-            catch {} // No errors please...
-        }
-
         /// <summary>
         /// Loads the plugin settings
         /// </summary>

FlashDevelop/Controls/Browser.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Text;
 using System.Drawing;
 using System.Windows.Forms;
 using System.ComponentModel;
-using System.Collections.Generic;
 using PluginCore.Localization;
-using PluginCore.Controls;
 using PluginCore.Helpers;
 using PluginCore;
+using Microsoft.Win32;
+using System.Reflection;
+using System.IO;
 
 namespace FlashDevelop.Controls
 {
@@ -21,6 +21,22 @@ public class Browser : UserControl
         private System.Windows.Forms.ToolStripSpringComboBox addressComboBox;
         private FlashDevelop.Controls.WebBrowserEx webBrowser;
 
+        static Browser()
+        {
+            try
+            {
+                // Sets a key in registry so that latest .NET browser control is used
+                String valueName = Path.GetFileName(Application.ExecutablePath);
+                String subKey = "Software\\Microsoft\\Internet Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION\\";
+                RegistryKey emu = Registry.CurrentUser.OpenSubKey(subKey, true);
+                {
+                    Object value = emu.GetValue(valueName);
+                    if (value == null) emu.SetValue(valueName, 0, RegistryValueKind.DWord);
+                }
+            }
+            catch { } // No errors please...
+        }
+
         public Browser()
         {
             this.Font = Globals.Settings.DefaultFont;