Skip to content

Commit f26ac29

Browse files
committed
Fixed displaying of solution with empty names
1 parent 9fdf4da commit f26ac29

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

VisualStudioDiscordRPC.Shared/Plugs/TextPlugs/SolutionNameTextPlug.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using VisualStudioDiscordRPC.Shared.Services;
33
using VisualStudioDiscordRPC.Shared.Observers;
44
using System.IO;
5+
using System;
56

67
namespace VisualStudioDiscordRPC.Shared.Plugs.TextPlugs
78
{
@@ -40,12 +41,18 @@ protected override string GetData()
4041
{
4142
Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
4243

44+
string noActiveSolutionString = _localizationService.Localize(LocalizationKeys.NoActiveSolution);
4345
if (_solution == null)
4446
{
45-
return _localizationService.Localize(LocalizationKeys.NoActiveSolution);
47+
return noActiveSolutionString;
4648
}
47-
49+
4850
string solutionName = Path.GetFileNameWithoutExtension(_solution.FullName);
51+
if (string.IsNullOrEmpty(solutionName))
52+
{
53+
return noActiveSolutionString;
54+
}
55+
4956
return string.Format("{0} {1}", _localizationService.Localize(LocalizationKeys.Solution), solutionName);
5057
}
5158
}

0 commit comments

Comments
 (0)