diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs index c1a6b68d5b..9b545427bc 100644 --- a/BizHawk.MultiClient/RenderPanel.cs +++ b/BizHawk.MultiClient/RenderPanel.cs @@ -417,12 +417,12 @@ namespace BizHawk.MultiClient if (Global.Config.DisplaySubtitles) { - //TODO: read subtitle positioning, implement multiple subtitles at once feature + //TODO: implement multiple subtitles at once feature Subtitle s = new Subtitle(Global.MainForm.UserMovie.Subtitles.GetSubtitle(Global.Emulator.Frame)); MessageFont.DrawString(null, s.Message, s.X + 1, s.Y + 1, new Color4(Color.Black)); MessageFont.DrawString(null, s.Message, s.X, - s.Y, new Color4(Color.White));//Color.FromArgb((int)s.Color)); + s.Y, Color.FromArgb((int)s.Color)); } } diff --git a/BizHawk.MultiClient/movie/EditSubtitlesForm.cs b/BizHawk.MultiClient/movie/EditSubtitlesForm.cs index 940d6854bb..50be84df1f 100644 --- a/BizHawk.MultiClient/movie/EditSubtitlesForm.cs +++ b/BizHawk.MultiClient/movie/EditSubtitlesForm.cs @@ -6,6 +6,7 @@ using System.Drawing; using System.Linq; using System.Text; using System.Windows.Forms; +using System.Globalization; namespace BizHawk.MultiClient { @@ -77,7 +78,7 @@ namespace BizHawk.MultiClient try { s.Duration = int.Parse(c.Value.ToString()); } catch { ShowError(x, 3); return; } c = SubGrid.Rows[x].Cells[4]; - try { s.Color = uint.Parse(c.Value.ToString()); } + try { s.Color = uint.Parse(c.Value.ToString(), NumberStyles.HexNumber); } catch { ShowError(x, 4); return; } try { c = SubGrid.Rows[x].Cells[5]; } catch { ShowError(x, 5); return; }