Save parameters when rebooting

morphx666 · Sep 8, 2018 · 2f23944 · 2f23944
1 parent b3a1108
commit 2f23944
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git a/GenOpCodes/My Project/AssemblyInfo.vb b/GenOpCodes/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2018.9.8.247")>
-<Assembly: AssemblyFileVersion("2018.9.8.247")>
+<Assembly: AssemblyVersion("2018.9.8.248")>
+<Assembly: AssemblyFileVersion("2018.9.8.248")>
diff --git a/RunTests/My Project/AssemblyInfo.vb b/RunTests/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2018.9.8.431")>
-<Assembly: AssemblyFileVersion("2018.9.8.431")>
+<Assembly: AssemblyVersion("2018.9.8.432")>
+<Assembly: AssemblyFileVersion("2018.9.8.432")>
diff --git a/x8086NetEmu/My Project/AssemblyInfo.vb b/x8086NetEmu/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2018.9.8.4958")>
-<Assembly: AssemblyFileVersion("2018.9.8.4951")>
+<Assembly: AssemblyVersion("2018.9.8.4964")>
+<Assembly: AssemblyFileVersion("2018.9.8.4957")>
diff --git a/x8086NetEmuConsole/My Project/AssemblyInfo.vb b/x8086NetEmuConsole/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2018.9.8.559")>
-<Assembly: AssemblyFileVersion("2018.9.8.554")>
+<Assembly: AssemblyVersion("2018.9.8.560")>
+<Assembly: AssemblyFileVersion("2018.9.8.555")>
diff --git a/x8086NetEmuWinForms/FormEmulator.vb b/x8086NetEmuWinForms/FormEmulator.vb
@@ -235,7 +235,10 @@ Public Class FormEmulator
     End Sub
 
     Private Sub StartEmulation()
-        cpu = New X8086(v20Emulation, True, AddressOf StartEmulation)
+        cpu = New X8086(v20Emulation, int13Emulation, Sub()
+                                                          SaveSettings()
+                                                          StartEmulation()
+                                                      End Sub)
 
         cpuState = New EmulatorState(cpu)
 

diff --git a/x8086NetEmuWinForms/My Project/AssemblyInfo.vb b/x8086NetEmuWinForms/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2018.9.8.4936")>
-<Assembly: AssemblyFileVersion("2018.9.8.4934")>
+<Assembly: AssemblyVersion("2018.9.8.4945")>
+<Assembly: AssemblyFileVersion("2018.9.8.4943")>
diff --git a/x8086NetEmuWinForms/x8086NetEmuWinForms.vbproj b/x8086NetEmuWinForms/x8086NetEmuWinForms.vbproj
@@ -147,7 +147,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\</OutputPath>
+    <OutputPath>..\x8086NetEmu\bin\</OutputPath>
     <DefineConstants>Win32 = True</DefineConstants>
     <RemoveIntegerChecks>true</RemoveIntegerChecks>
     <DocumentationFile>x8086NetEmuWinForms.xml</DocumentationFile>
@@ -171,7 +171,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\</OutputPath>
+    <OutputPath>..\x8086NetEmu\bin\</OutputPath>
     <DefineConstants>Win32 = False</DefineConstants>
     <DocumentationFile>x8086NetEmuWinForms.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
@@ -181,7 +181,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28Non Win%29|AnyCPU'">
     <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\</OutputPath>
+    <OutputPath>..\x8086NetEmu\bin\</OutputPath>
     <DefineConstants>Win32 = False</DefineConstants>
     <DocumentationFile>x8086NetEmuWinForms.xml</DocumentationFile>
     <Optimize>true</Optimize>
@@ -341,7 +341,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_DetectChanges="False" BuildVersion_BuildVersioningStyle="None.None.Increment.None" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" />
+      <UserProperties BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.None" BuildVersion_DetectChanges="False" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.