5.4.2.1

Changelog.md

@@ -1,4 +1,4 @@
-###
+### 5.4.2.1
 
 - pressing shift key suppresses auto-load-folder
 - switch --queue added, this will not clear the playlist but append
@@ -7,6 +7,8 @@
   [Open with++](https://github.com/stax76/OpenWithPlusPlus#add-to-mpvnet-playlist) shell extension, as far as I know multi selection
   can not be done using the Registry but only via shell extension
 - window-size mpv property support added ([default bindings](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L137))
+- the config editor keeps profiles and comments in mpv.conf intact!
+- the options in the config editor are better organized
 
 ### 5.4.2
 

mpv.net/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.2.0")]
-[assembly: AssemblyFileVersion("5.4.2.0")]
+[assembly: AssemblyVersion("5.4.2.1")]
+[assembly: AssemblyFileVersion("5.4.2.1")]

mpv.net/WPF/ConfWindow.xaml.cs

@@ -100,7 +100,7 @@ namespace mpvnet
             return string.Join("", SettingsDefinitions.Select(item => item.Name + item.Value).ToArray());
         }
 
-        string SectionComment;
+        Dictionary<string, string> SectionComment = new Dictionary<string, string>();
 
         void LoadConf(string file)
         {
@@ -127,8 +127,8 @@ namespace mpvnet
                 {
                     section = line.Substring(0, line.IndexOf("]") + 1);
 
-                    if (SectionComment == null)
-                        SectionComment = comment;
+                    if (!SectionComment.ContainsKey(file))
+                        SectionComment[file] = comment;
 
                     comment = "";
                     isSectionItem = true;
@@ -211,11 +211,11 @@ namespace mpvnet
                 }
             }
 
-            if (SectionComment != "")
-                sb.Append(SectionComment);
+            if (SectionComment.ContainsKey(name) && SectionComment[name] != "\r\n")
+                sb.Append(SectionComment[name]);
 
-            if (!sb.ToString().Contains("\r\n# Editor"))
-                sb.AppendLine("\r\n# Editor");
+            if (!sb.ToString().Contains("# Editor"))
+                sb.AppendLine("# Editor");
 
             foreach (SettingBase setting in SettingsDefinitions)
             {