UI: Fixed filter for file open dialog

SourMesen · Apr 1, 2019 · ed38bacbbd35272169ebbb357e45887d93468e4a · ed38bac
1 parent adcb625
commit ed38bacbbd35272169ebbb357e45887d93468e4a
Showing with 2 additions and 6 deletions.

+1 −1 UI/Dependencies/resources.en.xml

+1 −1 UI/Emulation/ShortcutHandler.cs

+0 −4 UI/UI.csproj
diff --git a/UI/Dependencies/resources.en.xml b/UI/Dependencies/resources.en.xml
@@ -769,7 +769,7 @@
 		<Message ID="FilterWave">Wave files (*.wav)|*.wav|All Files (*.*)|*.*</Message>
 		<Message ID="FilterAvi">Avi files (*.avi)|*.avi|All Files (*.*)|*.*</Message>
 		<Message ID="FilterPalette">Palette Files (*.pal)|*.pal|All Files (*.*)|*.*</Message>
-		<Message ID="FilterRom">All supported formats (*.sfc, *.zip, *.7z)|*.SFC;*.ZIP;*.7Z|SNES Roms (*.sfc)|*.SFC|ZIP Archives (*.zip)|*.ZIP|7-Zip Archives (*.7z)|*.7z|All (*.*)|*.*</Message>
+		<Message ID="FilterRom">All supported formats (*.sfc, *.zip, *.7z)|*.SFC;*.SMC;*.SWC;*.FIG;*.ZIP;*.7Z|SNES Roms (*.sfc)|*.SFC;*.SMC;*.SWC;*.FIG|ZIP Archives (*.zip)|*.ZIP|7-Zip Archives (*.7z)|*.7z|All (*.*)|*.*</Message>
 		<Message ID="FilterRomIps">All supported formats (*.nes, *.zip, *.7z, *.fds, *.nsf, *.nsfe, *.unf, *.ips, *.bps, *.ups)|*.NES;*.ZIP;*.7z;*.IPS;*.BPS;*.UPS;*.FDS;*.NSF;*.NSFE;*.UNF|NES Roms (*.nes, *.unf)|*.NES;*.UNF|Famicom Disk System Roms (*.fds)|*.FDS|NSF files (*.nsf, *.nsfe)|*.nsf;*.nsfe|ZIP Archives (*.zip)|*.ZIP|7-Zip Archives (*.7z)|*.7z|IPS/UPS/BPS Patches (*.ips, *.bps, *.ups)|*.IPS;*.BPS;*.UPS|All (*.*)|*.*</Message>
 		<Message ID="FilterTest">Test files (*.mtp)|*.mtp|All (*.*)|*.*</Message>
 		<Message ID="FilterCheat">All supported formats (*.cht, *.xml)|*.cht;*.xml</Message>

diff --git a/UI/Emulation/ShortcutHandler.cs b/UI/Emulation/ShortcutHandler.cs
@@ -134,7 +134,7 @@ public void ExecuteShortcut(EmulatorShortcut shortcut)
 		private void OpenFile()
 		{
 			using(OpenFileDialog ofd = new OpenFileDialog()) {
-				ofd.Filter = ResourceHelper.GetMessage("FilterRom");
+				ofd.SetFilter(ResourceHelper.GetMessage("FilterRom"));
 
 				if(ConfigManager.Config.Preferences.OverrideGameFolder && Directory.Exists(ConfigManager.Config.Preferences.GameFolder)) {
 					ofd.InitialDirectory = ConfigManager.Config.Preferences.GameFolder;

diff --git a/UI/UI.csproj b/UI/UI.csproj
@@ -1019,13 +1019,9 @@
     <PreBuildEvent>mkdir "Dependencies"
 
 if "PGO Optimize" == "$(ConfigurationName)" (
-copy "$(SolutionDir)bin\x86\PGO Profile\MesenSCore.dll" "Dependencies\MesenSCore.x86.dll"
-
 copy "$(SolutionDir)bin\x64\PGO Profile\MesenSCore.dll" "Dependencies\MesenSCore.x64.dll"
 )
 if NOT "PGO Optimize" == "$(ConfigurationName)" (
-copy "$(SolutionDir)bin\x86\$(ConfigurationName)\MesenSCore.dll" "Dependencies\MesenSCore.x86.dll"
-
 copy "$(SolutionDir)bin\x64\$(ConfigurationName)\MesenSCore.dll" "Dependencies\MesenSCore.x64.dll"
 )
 copy "MesenUpdater.exe" "Dependencies\MesenUpdater.exe"