]> granicus.if.org Git - handbrake/commitdiff
WinGui: (0.9.x) File Handler was not being released, now fixed.
authorsr55 <sr55.hb@outlook.com>
Thu, 12 Apr 2012 19:51:34 +0000 (19:51 +0000)
committersr55 <sr55.hb@outlook.com>
Thu, 12 Apr 2012 19:51:34 +0000 (19:51 +0000)
git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.9.x@4596 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs

index cd535a6bb80fa036fb366aace6af5ec2510c0f36..8def2c2753c2d822bb7bd2ca3af1dfbfb42a0f27 100644 (file)
@@ -386,11 +386,12 @@ namespace HandBrake.ApplicationServices.Utilities
                 if (!File.Exists(filename))\r
                     return null;\r
 \r
-                StreamReader sr = File.OpenText(filename);\r
                 string fromfile = string.Empty;\r
-                int fileChar;\r
-                while ((fileChar = sr.Read()) != -1)\r
-                    fromfile += Convert.ToChar(fileChar);\r
+                using (StreamReader sr = File.OpenText(filename))\r
+                {\r
+                    int fileChar;\r
+                    while ((fileChar = sr.Read()) != -1) fromfile += Convert.ToChar(fileChar);\r
+                }\r
 \r
                 XmlDocument doc = new XmlDocument();\r
                 doc.LoadXml(fromfile);\r
@@ -432,27 +433,28 @@ namespace HandBrake.ApplicationServices.Utilities
         public static void Export(string path, Preset preset)\r
         {\r
             EncodeTask parsed = QueryParserUtility.Parse(preset.Query);\r
-            XmlTextWriter xmlWriter = new XmlTextWriter(path, Encoding.UTF8) { Formatting = Formatting.Indented };\r
-\r
-            // Header\r
-            xmlWriter.WriteStartDocument();\r
-            xmlWriter.WriteDocType("plist", "-//Apple//DTD PLIST 1.0//EN",\r
-                                @"http://www.apple.com/DTDs/PropertyList-1.0.dtd", null);\r
+            using (XmlTextWriter xmlWriter = new XmlTextWriter(path, Encoding.UTF8) { Formatting = Formatting.Indented })\r
+            {\r
+                // Header\r
+                xmlWriter.WriteStartDocument();\r
+                xmlWriter.WriteDocType(\r
+                    "plist", "-//Apple//DTD PLIST 1.0//EN", @"http://www.apple.com/DTDs/PropertyList-1.0.dtd", null);\r
 \r
-            xmlWriter.WriteStartElement("plist");\r
-            xmlWriter.WriteStartElement("array");\r
+                xmlWriter.WriteStartElement("plist");\r
+                xmlWriter.WriteStartElement("array");\r
 \r
-            // Add New Preset Here. Can write multiple presets here if required in future.\r
-            WritePreset(xmlWriter, parsed, preset);\r
+                // Add New Preset Here. Can write multiple presets here if required in future.\r
+                WritePreset(xmlWriter, parsed, preset);\r
 \r
-            // Footer\r
-            xmlWriter.WriteEndElement();\r
-            xmlWriter.WriteEndElement();\r
+                // Footer\r
+                xmlWriter.WriteEndElement();\r
+                xmlWriter.WriteEndElement();\r
 \r
-            xmlWriter.WriteEndDocument();\r
+                xmlWriter.WriteEndDocument();\r
 \r
-            // Closeout\r
-            xmlWriter.Close();\r
+                // Closeout\r
+                xmlWriter.Close();\r
+            }\r
         }\r
 \r
         /// <summary>\r