From 88c568b8749be4fe4ae0a4594a4184f24208e974 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Thu, 21 Jan 2010 23:08:07 +0000 Subject: [PATCH] Fixed NullReferenceException in ICSharpCode.Svn.SvnGuiWrapper.GetPathFromRegistry(RegistryHive hive, String valueName) when TortoiseSVN is not installed (bug introduced in r5246). git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5423 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs index d551df48ac..37611ac88c 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs @@ -26,7 +26,10 @@ namespace ICSharpCode.Svn RegistryView view = Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Default; using (RegistryKey baseKey = RegistryKey.OpenBaseKey(hive, view)) { using (RegistryKey key = baseKey.OpenSubKey("SOFTWARE\\TortoiseSVN")) { - return key.GetValue(valueName) as string; + if (key != null) + return key.GetValue(valueName) as string; + else + return null; } } }