From c6a5c7e9b60c3190efa4690dd6070cbdf0d42bad Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Sat, 18 Jun 2011 21:39:53 +0000 Subject: [PATCH] change references of Global.Game.Name to Global.Game.FileSystemSafeName for situations that use it to build paths --- BizHawk.MultiClient/MainForm.cs | 9 ++++----- BizHawk.MultiClient/RecordMovie.cs | 2 +- BizHawk.MultiClient/movie/Movie.cs | 2 +- BizHawk.MultiClient/tools/Cheats.cs | 2 +- BizHawk.MultiClient/tools/RamSearch.cs | 2 +- BizHawk.MultiClient/tools/RamWatch.cs | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 02c0e622cc..064fb7bfb2 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -818,11 +818,10 @@ namespace BizHawk.MultiClient Global.Game = game; SyncControls(); - //if (game.System == "NES") - //{ - // Global.Game.Name = (Global.Emulator as NES).GameName; - //} - //adelikat: Disabling this because it causes invalid characters (such as :) in file paths, why do we want these lines + if (game.System == "NES") + { + Global.Game.Name = (Global.Emulator as NES).GameName; + } Text = DisplayNameForSystem(game.System) + " - " + game.Name; ResetRewindBuffer(); diff --git a/BizHawk.MultiClient/RecordMovie.cs b/BizHawk.MultiClient/RecordMovie.cs index 1d2ce256a1..954342d309 100644 --- a/BizHawk.MultiClient/RecordMovie.cs +++ b/BizHawk.MultiClient/RecordMovie.cs @@ -66,7 +66,7 @@ namespace BizHawk.MultiClient SaveFileDialog sfd = new SaveFileDialog(); sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.MoviesPath, ""); sfd.DefaultExt = ".tas"; - sfd.FileName = Global.Game.Name; + sfd.FileName = Global.Game.FilesystemSafeName; sfd.Filter = "Movie files (*.tas)|*.TAS"; Global.Sound.StopSound(); diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs index 61ce5dade1..21895e9fe2 100644 --- a/BizHawk.MultiClient/movie/Movie.cs +++ b/BizHawk.MultiClient/movie/Movie.cs @@ -75,7 +75,7 @@ namespace BizHawk.MultiClient MakeBackup = false; } Log.Clear(); - Header = new MovieHeader(MainForm.EMUVERSION, MovieHeader.MovieVersion, Global.Emulator.SystemId, Global.Game.Name, "", 0); + Header = new MovieHeader(MainForm.EMUVERSION, MovieHeader.MovieVersion, Global.Emulator.SystemId, Global.Game.FilesystemSafeName, "", 0); } public void StartPlayback() diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs index acc927455f..c9c15117f0 100644 --- a/BizHawk.MultiClient/tools/Cheats.cs +++ b/BizHawk.MultiClient/tools/Cheats.cs @@ -380,7 +380,7 @@ namespace BizHawk.MultiClient if (currentCheatFile.Length > 0) sfd.FileName = Path.GetFileNameWithoutExtension(currentCheatFile); else if (!(Global.Emulator is NullEmulator)) - sfd.FileName = Global.Game.Name; + sfd.FileName = Global.Game.FilesystemSafeName; sfd.InitialDirectory = GetCheatsPath(); sfd.Filter = "Cheat Files (*.cht)|*.cht|All Files|*.*"; sfd.RestoreDirectory = true; diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs index 6f8f4d3622..f9fe0dd085 100644 --- a/BizHawk.MultiClient/tools/RamSearch.cs +++ b/BizHawk.MultiClient/tools/RamSearch.cs @@ -1275,7 +1275,7 @@ namespace BizHawk.MultiClient } else if (!(Global.Emulator is NullEmulator)) { - sfd.FileName = Global.Game.Name; + sfd.FileName = Global.Game.FilesystemSafeName; sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.WatchPath, ""); } else diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs index 2a6a9e591c..80731cb311 100644 --- a/BizHawk.MultiClient/tools/RamWatch.cs +++ b/BizHawk.MultiClient/tools/RamWatch.cs @@ -645,7 +645,7 @@ namespace BizHawk.MultiClient } else if (!(Global.Emulator is NullEmulator)) { - sfd.FileName = Global.Game.Name; + sfd.FileName = Global.Game.FilesystemSafeName; sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.WatchPath, ""); } else