2007-11-20 Jonathan Pobst <monkey@jpobst.com>

	* Application.cs: Revert r89650, as it broke a common case to fix
	an obscure case.  Fixes bug #342606.

svn path=/trunk/mcs/; revision=90044

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Application.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Application.cs
index 711321832e7705cca5cff780ce97df6e09ba654a..ba26caac69d3a485c3f7e17efeeadd1355196dc0 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Application.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Application.cs
@@ -242,7 +242,7 @@ namespace System.Windows.Forms
 
                public static string ExecutablePath {
                        get {
-                               return Path.GetFullPath (Process.GetCurrentProcess ().MainModule.FileName);
+                               return Assembly.GetEntryAssembly().Location;
                        }
                }
 

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 4c5a956dce3b07220cdaf901f13384a769a2f8b1..7e98a45d46185e17e77d65277234c33b1ffe7ea6 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-20  Jonathan Pobst  <monkey@jpobst.com>
+
+       * Application.cs: Revert r89650, as it broke a common case to fix
+       an obscure case.  Fixes bug #342606.
+
 2007-11-20  Everaldo Canuto  <ecanuto@novell.com>
 
        * ThemeWin32Classic.cs: Fix extra space on end of tooltip.