Restart related improvements:

- Added new button flag: IsOnlyInstance
- Added new method to get the amount of instances running
- Restart button is now enabled when only one instance is running
- Improved restart button visibility

Author: Meychi

FlashDevelop/Bin/Debug/Settings/MainMenu.xml

@@ -59,7 +59,7 @@
 		<button label="Label.Print" click="Print" shortcut="Control|P" image="343" flags="Enable:IsEditable" />
 		<button label="Label.PrintPreview" click="PrintPreview" shortcut="Control|Shift|P" flags="Enable:IsEditable" />
 		<separator />
-		<button label="Label.Restart" click="Restart" flags="Enable:!MultiInstanceMode" />
+		<button label="Label.Restart" click="Restart" flags="Enable:IsOnlyInstance" />
 		<button label="Label.Exit" click="Exit" />
 	</menu>
 	<menu label="Label.Edit" name="EditMenu">

FlashDevelop/MainForm.cs

@@ -754,8 +754,9 @@ private void AppManUpdate(Object sender, FileSystemEventArgs e)
         private void InitializeRestartButton()
         {
             this.restartButton = new ToolStripButton();
-            this.restartButton.Image = this.FindImage("69");
+            this.restartButton.Image = this.FindImage("73|6|3|3");
             this.restartButton.Alignment = ToolStripItemAlignment.Right;
+            this.restartButton.Text = TextHelper.GetString("Label.Restart");
             this.restartButton.ToolTipText = TextHelper.GetString("Info.RequiresRestart");
             this.restartButton.Click += delegate { this.Restart(null, null); };
             this.restartButton.Visible = false;
@@ -2202,6 +2203,15 @@ public String GetWorkingDirectory()
 
         }
 
+        /// <summary>
+        /// Gets the amount instances running
+        /// </summary>
+        public Int32 GetInstanceCount()
+        {
+            Process current = Process.GetCurrentProcess();
+            return Process.GetProcessesByName(current.ProcessName).Length;
+        }
+
         /// <summary>
         /// Sets the text to find globally
         /// </summary>
@@ -4232,8 +4242,11 @@ public void Debug(Object sender, EventArgs e)
         /// </summary>
         public void Restart(Object sender, EventArgs e)
         {
-            this.restartRequested = true;
-            this.Close();
+            if (this.GetInstanceCount() == 1)
+            {
+                this.restartRequested = true;
+                this.Close();
+            }
         }
 
         #endregion

FlashDevelop/Managers/ButtonManager.cs

@@ -134,6 +134,14 @@ public static Boolean ValidateFlagAction(ToolStripItem item, String action)
             {
                 if (!mainForm.IsFullScreen) return false;
             }
+            if (action.Contains("!IsOnlyInstance"))
+            {
+                if (mainForm.GetInstanceCount() == 1) return false;
+            }
+            else if (action.Contains("IsOnlyInstance"))
+            {
+                if (mainForm.GetInstanceCount() > 1) return false;
+            }
             if (action.Contains("TracksBoolean"))
             {
                 Boolean value = (Boolean)Globals.Settings.GetValue(((ItemData)item.Tag).Tag);

PluginCore/PluginCore/Interfaces.cs

@@ -272,6 +272,10 @@ public interface IMainForm : IContainerControl, IWin32Window
         /// Equivalent to calling <code>ImageSetAdjust(FindImage(data, false))</code>.
         /// </summary>
         Image FindImageAndSetAdjust(String data);
+        /// <summary>
+        /// Gets the amount of FD instances running
+        /// </summary>
+        Int32 GetInstanceCount();
 
         #endregion