- Save project session on FD close

- Restore project session if file session is not restored
- Fix AS2Project display string

Author: Meychi

External/Plugins/ProjectManager/PluginMain.cs

@@ -96,7 +96,7 @@ public class PluginMain : IPlugin
         public static IMainForm MainForm { get { return PluginBase.MainForm; } }
         public static ProjectManagerSettings Settings;
 
-        const EventType eventMask = EventType.UIStarted | EventType.FileOpening
+        const EventType eventMask = EventType.UIStarted | EventType.UIClosing | EventType.FileOpening
             | EventType.FileOpen | EventType.FileSave | EventType.FileSwitch | EventType.ProcessStart | EventType.ProcessEnd
             | EventType.ProcessArgs | EventType.Command | EventType.Keys | EventType.ApplySettings;
 
@@ -371,6 +371,11 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
                     });
                     break;
 
+                case EventType.UIClosing:
+                    // save project session, documents have not been closed yet
+                    SaveProjectSession();
+                    break;
+
                 // replace $(SomeVariable) type stuff with things we know about
                 case EventType.ProcessArgs:
                     project = activeProject; // replace arguments using active project data
@@ -640,7 +645,10 @@ void SetProject(Project project, Boolean stealFocus, Boolean internalOpening)
             listenToPathChange = true;
 
             // activate
-            if (!internalOpening) RestoreProjectSession(project);
+            if (!internalOpening || (internalOpening && !PluginBase.Settings.RestoreFileSession))
+            {
+                RestoreProjectSession(project);
+            }
 
             if (stealFocus)
             {

External/Plugins/ProjectManager/Projects/AS2/AS2Project.cs

@@ -14,7 +14,7 @@ public AS2Project(string path)
         }
 
         public override string Language { get { return "as2"; } }
-        public override string LanguageDisplayName { get { return "AS3"; } }
+        public override string LanguageDisplayName { get { return "AS2"; } }
         public override bool IsCompilable { get { return true; } }
         public override bool UsesInjection { get { return InputPath != ""; } }
         public override bool HasLibraries { get { return OutputType == OutputType.Application && !UsesInjection; } }

PluginCore/PluginCore/Interfaces.cs

@@ -232,6 +232,7 @@ public interface ISettings
         Boolean DisableFindTextUpdating { get; set; }
         Boolean ApplyFileExtension { get; set; }
         Boolean RestoreFileStates { get; set; }
+        Boolean RestoreFileSession { get; set; }
         Boolean BackSpaceUnIndents { get; set; }
         Boolean BraceMatchingEnabled { get; set; }
         Boolean CaretLineVisible { get; set; }