Fixed multiple instance opening at one moment. Version update. Deftin…

…itions reorder.
TBXin · Aug 16, 2016 · a30b5d6 · a30b5d6
1 parent 268b171
commit a30b5d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/NFirmwareEditor/Core/Consts.cs b/src/NFirmwareEditor/Core/Consts.cs
@@ -2,7 +2,7 @@
 {
 	internal static class Consts
 	{
-		internal const string ApplicationVersion = "4.05";
+		internal const string ApplicationVersion = "4.06";
 		internal const string ApplicationTitleWoVersion = "NFirmwareEditor";
 		internal const string ApplicationTitle = ApplicationTitleWoVersion + " v" + ApplicationVersion;
 

diff --git a/src/NFirmwareEditor/Definitions.xml b/src/NFirmwareEditor/Definitions.xml
@@ -2,10 +2,10 @@
 <ArrayOfFirmwareDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
 	<!-- RX23 -->
-	<FirmwareDefinition Name="RX23 4.02">
+	<FirmwareDefinition Name="RX23 4.12">
 		<Marker Offset="0x90" Bytes="0x15 0x23" />
 		<Marker Offset="0xC0" Bytes="0x29 0x72" />
-		<Marker Offset="0xA30" Bytes="0x40 0xF2" />
+		<Marker Offset="0xA30" Bytes="0x4F 0xF4" />
 		<ImageTable1>
 			<OffsetFrom>0xC724</OffsetFrom>
 			<OffsetTo>0xCB24</OffsetTo>
@@ -20,11 +20,11 @@
 		</StringTable1>
 		<CharsToCorrect>0x88 0x91 0x9A</CharsToCorrect>
 	</FirmwareDefinition>
-
-	<FirmwareDefinition Name="RX23 4.12">
+	
+	<FirmwareDefinition Name="RX23 4.02">
 		<Marker Offset="0x90" Bytes="0x15 0x23" />
 		<Marker Offset="0xC0" Bytes="0x29 0x72" />
-		<Marker Offset="0xA30" Bytes="0x4F 0xF4" />
+		<Marker Offset="0xA30" Bytes="0x40 0xF2" />
 		<ImageTable1>
 			<OffsetFrom>0xC724</OffsetFrom>
 			<OffsetTo>0xCB24</OffsetTo>

diff --git a/src/NFirmwareEditor/Managers/FirmwareDefinitionManager.cs b/src/NFirmwareEditor/Managers/FirmwareDefinitionManager.cs
@@ -21,7 +21,7 @@ public List<FirmwareDefinition> Load()
 			try
 			{
 				var serializer = new XmlSerializer(typeof(List<FirmwareDefinition>));
-				using (var fs = File.Open(Paths.DefinitionsFile, FileMode.Open))
+				using (var fs = File.OpenRead(Paths.DefinitionsFile))
 				{
 					var result = serializer.Deserialize(fs) as List<FirmwareDefinition> ?? new List<FirmwareDefinition>();
 					if (result.Any(definition => string.IsNullOrEmpty(definition.Name)