From 68ec2bea244ff6ce3bc71751c8885159b89f5bd8 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Mon, 6 Mar 2006 18:31:20 +0000 Subject: [PATCH] Fixed format exception when adding a reference to a COM library that has version numbers which are characters rather than numbers. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1200 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Base/Project/Src/Project/Items/TypeLibrary.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Main/Base/Project/Src/Project/Items/TypeLibrary.cs b/src/Main/Base/Project/Src/Project/Items/TypeLibrary.cs index 88b9e44453..3e7b6d209f 100644 --- a/src/Main/Base/Project/Src/Project/Items/TypeLibrary.cs +++ b/src/Main/Base/Project/Src/Project/Items/TypeLibrary.cs @@ -66,7 +66,7 @@ namespace ICSharpCode.SharpDevelop.Project } string[] ver = version.Split('.'); - return ver.Length == 0 ? -1 : Int32.Parse(ver[0]); + return ver.Length == 0 ? -1 : GetVersion(ver[0]); } } @@ -77,7 +77,7 @@ namespace ICSharpCode.SharpDevelop.Project } string[] ver = version.Split('.'); - return ver.Length < 2 ? -1 : Int32.Parse(ver[1]); + return ver.Length < 2 ? -1 : GetVersion(ver[1]); } } @@ -146,5 +146,14 @@ namespace ICSharpCode.SharpDevelop.Project } return null; } + + static int GetVersion(string s) + { + int version; + if (Int32.TryParse(s, out version)) { + return version; + } + return -1; + } } }