From 3fbd9b38d0bd1b8e8f494525831883637595e758 Mon Sep 17 00:00:00 2001 From: niksedk Date: Sat, 24 Dec 2011 12:32:30 +0000 Subject: [PATCH] Fixed another crash in settings git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@856 99eadd0c-20b8-1223-b5c4-2a2b2df33de2 --- src/Forms/Main.cs | 2 +- src/Forms/Settings.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 09ee54605..80a742ba2 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -141,7 +141,7 @@ namespace Nikse.SubtitleEdit.Forms string[] versionInfo = Utilities.AssemblyVersion.Split('.'); _title = String.Format("{0} {1}.{2}", _languageGeneral.Title, versionInfo[0], versionInfo[1]); if (versionInfo.Length >= 3 && versionInfo[2] != "0") - _title += "." + versionInfo[2] + " beta 2"; + _title += "." + versionInfo[2] + " beta 3"; } return _title; } diff --git a/src/Forms/Settings.cs b/src/Forms/Settings.cs index 66d14976a..25478223f 100644 --- a/src/Forms/Settings.cs +++ b/src/Forms/Settings.cs @@ -978,7 +978,7 @@ namespace Nikse.SubtitleEdit.Forms Configuration.Settings.Shortcuts.MainAdjustSetStartAndOffsetTheRest = GetShortcut(node.Text); else if (text == Configuration.Settings.Language.Main.VideoControls.SetEndTimeAndGoToNext.Replace("&", string.Empty)) Configuration.Settings.Shortcuts.MainAdjustSetEndAndGotoNext = GetShortcut(node.Text); - else if (text == Configuration.Settings.Language.Settings.AdjustSetStartAutoDurationAndGoToNext.Replace("&", string.Empty)) + else if (Configuration.Settings.Language.Settings.AdjustSetStartAutoDurationAndGoToNext != null && text == Configuration.Settings.Language.Settings.AdjustSetStartAutoDurationAndGoToNext.Replace("&", string.Empty)) Configuration.Settings.Shortcuts.MainAdjustSetStartAutoDurationAndGoToNext = GetShortcut(node.Text); else if (text == Configuration.Settings.Language.Main.VideoControls.SetStartTime.Replace("&", string.Empty)) Configuration.Settings.Shortcuts.MainAdjustSetStart = GetShortcut(node.Text);