diff options
| author | Mike Krüger <mkrueger@novell.com> | 2010-07-06 20:40:27 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@novell.com> | 2010-07-06 20:40:27 +0400 |
| commit | 605ba3e13223ace5a45a28d584723395d59462b0 (patch) | |
| tree | 3fdfa423ec66596732c9a0851efeffc1a8427087 /main/src/addins/MonoDevelop.Moonlight | |
| parent | 45a9303b8722aca2dcc4220460bb18970ae0c584 (diff) | |
* MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs: reverted
change (the bug is gone).
svn path=/trunk/monodevelop/; revision=159971
Diffstat (limited to 'main/src/addins/MonoDevelop.Moonlight')
| -rw-r--r-- | main/src/addins/MonoDevelop.Moonlight/ChangeLog | 5 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/main/src/addins/MonoDevelop.Moonlight/ChangeLog b/main/src/addins/MonoDevelop.Moonlight/ChangeLog index d2a9f88430..d1d7b13fee 100644 --- a/main/src/addins/MonoDevelop.Moonlight/ChangeLog +++ b/main/src/addins/MonoDevelop.Moonlight/ChangeLog @@ -1,5 +1,10 @@ 2010-07-06 Mike Krüger <mkrueger@novell.com> + * MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs: reverted + change (the bug is gone). + +2010-07-06 Mike Krüger <mkrueger@novell.com> + * MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs: added null check. diff --git a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs index 34f32a1e31..7c4e4c713b 100644 --- a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs +++ b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs @@ -112,7 +112,7 @@ namespace MonoDevelop.Moonlight string path; if (targetRuntime.EnvironmentVariables.TryGetValue ("MOONLIGHT_SDK_PATH", out path)) yield return (FilePath) path; - yield return ((FilePath)(base.targetRuntime.Prefix ?? "")).Combine ("lib", "moonlight"); + yield return ((FilePath)base.targetRuntime.Prefix).Combine ("lib", "moonlight"); var env = System.Environment.GetEnvironmentVariable ("MOONLIGHT_SDK_PATH"); if (!string.IsNullOrEmpty (env)) yield return (FilePath) env; |