diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2022-09-07 15:43:49 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2022-09-08 07:10:25 +0000 |
| commit | 4c101d043dbbc46fb93ef9049e743cb8ed1ac7de (patch) | |
| tree | 2d555f3c6c9eeb58ab8888dc244e1b136441012b | |
| parent | ff6a7a523e42bf0a33e77ef11b733f4899d2df47 (diff) | |
Fix possible ArgumentException in case of empty QTDIR
Change-Id: I793c2d00bca5e025b437acf6e3af910360cf3ed0
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
| -rw-r--r-- | QtVsTools.Core/QtVersionManager.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/QtVsTools.Core/QtVersionManager.cs b/QtVsTools.Core/QtVersionManager.cs index 77b443ed..351fd747 100644 --- a/QtVsTools.Core/QtVersionManager.cs +++ b/QtVsTools.Core/QtVersionManager.cs @@ -417,12 +417,12 @@ namespace QtVsTools.Core if (defaultVersion == null) { // last fallback... try QTDIR var qtDir = Environment.GetEnvironmentVariable("QTDIR"); - if (qtDir == null) + if (string.IsNullOrEmpty(qtDir)) return null; - var d = new DirectoryInfo(qtDir); - SaveVersion(d.Name, d.FullName); - if (SaveDefaultVersion(d.Name)) - defaultVersion = d.Name; + var name = Path.GetFileName(qtDir); + SaveVersion(name, Path.GetFullPath(qtDir)); + if (SaveDefaultVersion(name)) + defaultVersion = name; } } return VerifyIfQtVersionExists(defaultVersion) ? defaultVersion : null; |