From d8918f3b1b38c73818a88b67dc1e8d9a3ebd0242 Mon Sep 17 00:00:00 2001
From: Emmet Young <death-droid@hotmail.com>
Date: Sat, 31 Jan 2015 23:51:24 +1100
Subject: [PATCH 1/2] [!] Add plugin base files to vcxproj

---
 Source/Project64/Project64.vcxproj         | 2 ++
 Source/Project64/Project64.vcxproj.filters | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj
index 169c633bc..f347bc240 100644
--- a/Source/Project64/Project64.vcxproj
+++ b/Source/Project64/Project64.vcxproj
@@ -56,6 +56,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="Plugins\Plugin Base.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
@@ -197,6 +198,7 @@
     <ClInclude Include="Multilanguage.h" />
     <ClInclude Include="N64 System.h" />
     <ClInclude Include="Plugin.h" />
+    <ClInclude Include="Plugins\Plugin Base.h" />
     <ClInclude Include="Settings.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="User Interface.h" />
diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters
index 8e076f143..a9ca22038 100644
--- a/Source/Project64/Project64.vcxproj.filters
+++ b/Source/Project64/Project64.vcxproj.filters
@@ -417,6 +417,9 @@
     <ClCompile Include="3rd Party\zlib\zip.c">
       <Filter>Source Files\3rd Party Source\ZLib Source</Filter>
     </ClCompile>
+    <ClCompile Include="Plugins\Plugin Base.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="User Interface\Bitmaps\AboutScreenBottom.bmp">
@@ -839,5 +842,8 @@
     <ClInclude Include="3rd Party\zlib\ZLIB.H">
       <Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
     </ClInclude>
+    <ClInclude Include="Plugins\Plugin Base.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 64e9135d198ecb4f8c2fce7185bfab9106d04fc0 Mon Sep 17 00:00:00 2001
From: Emmet Young <death-droid@hotmail.com>
Date: Sat, 31 Jan 2015 23:52:35 +1100
Subject: [PATCH 2/2] [!]Fix peculiar issue where save states would not save
 instantly when using "Save as", and in some cases not save at all. Fix this
 by making an event call instead.

---
 Source/Project64/User Interface/Main Menu Class.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Project64/User Interface/Main Menu Class.cpp b/Source/Project64/User Interface/Main Menu Class.cpp
index a765a50fc..8d4f5dd68 100644
--- a/Source/Project64/User Interface/Main Menu Class.cpp	
+++ b/Source/Project64/User Interface/Main Menu Class.cpp	
@@ -167,12 +167,12 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
 						_makepath( SaveFile, drive, dir, fname, NULL );
 					}
 				}
-				g_Settings->SaveString(GameRunning_InstantSaveFile,SaveFile);
+				g_Settings->SaveString(GameRunning_InstantSaveFile, SaveFile);
 
 				char SaveDir[MAX_PATH];
 				_makepath( SaveDir, drive, dir, NULL, NULL );
 				g_Settings->SaveString(Directory_LastSave,SaveDir);
-				g_System->SaveState();
+				g_BaseSystem->ExternalEvent(SysEvent_SaveMachineState);
 			}
 			g_BaseSystem->ExternalEvent(SysEvent_ResumeCPU_SaveGame);
 		}