diff options
| author | therzok <marius.ungureanu@xamarin.com> | 2016-10-04 18:48:46 +0300 |
|---|---|---|
| committer | therzok <marius.ungureanu@xamarin.com> | 2016-10-04 18:49:00 +0300 |
| commit | d919c82b8da76698e1c30b44168c615ea70119f6 (patch) | |
| tree | 7470af4103e983d7b6f164a0a0dfb8878c94862a /main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar | |
| parent | 1a48ca790506ddaef15f6355e5879bad0a6edbf1 (diff) | |
[Ide] Fix NRE caused by searchpopup optimizations
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs index ee72a25f89..ad38ec5db8 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs @@ -1014,13 +1014,15 @@ namespace MonoDevelop.Components.MainToolbar string text = result.GetMarkupText (selected); string desc = result.GetDescriptionMarkupText (); - var sb = new System.Text.StringBuilder (text.Length + resultFgColor.Length + desc.Length + descFgColor.Length + 68); + int descLength = desc != null ? desc.Length : 0; + + var sb = new System.Text.StringBuilder (text.Length + resultFgColor.Length + descLength + descFgColor.Length + 68); sb.Append ("<span foreground=\""); sb.Append (resultFgColor); sb.Append ("\">"); sb.Append (text); sb.Append ("</span>"); - if (!string.IsNullOrEmpty (desc)) { + if (descLength > 0) { sb.Append ("<span foreground=\""); sb.Append (descFgColor); sb.Append ("\" size=\"small\">\n"); |