Author: mhutch
Date: 2007-11-20 12:35:14 -0500 (Tue, 20 Nov 2007)
New Revision: 89998

Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
Log:
* MonoDevelop.Ide.Gui/IdeStartup.cs: Capture previous value of
  MONO_MANAGED_WATCHER in the case where MD overrides it, and assign
  the old value to processes launched from MD. Fixes "Bug 342965 -
  When running my program from monodevelop (F5) MONO_MANAGED_WATCHER
  is enabled".

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-11-20 
17:33:01 UTC (rev 89997)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-11-20 
17:35:14 UTC (rev 89998)
@@ -1,3 +1,11 @@
+2007-11-20  Michael Hutchinson <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.Ide.Gui/IdeStartup.cs: Capture previous value of
+         MONO_MANAGED_WATCHER in the case where MD overrides it, and assign the
+         old value to processes launched from MD. Fixes "Bug 342965 - When
+         running my program from monodevelop (F5) MONO_MANAGED_WATCHER is
+         enabled".
+
 2007-11-19  Michael Hutchinson <[EMAIL PROTECTED]> 
 
        * MonoDevelop.Ide.Gui/InternalLog.cs: Fix error notification

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs    
    2007-11-20 17:33:01 UTC (rev 89997)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs    
    2007-11-20 17:35:14 UTC (rev 89998)
@@ -264,11 +264,13 @@
                                                msg += "MonoDevelop will switch 
to managed file watching.\n";
                                                msg += "See 
http://www.monodevelop.com/Inotify_Watches_Limit for more info.";
                                                LoggingService.LogWarning (msg);
+                                               
Runtime.ProcessService.EnvironmentVariableOverrides["MONO_MANAGED_WATCHER"] = 
+                                                       
Environment.GetEnvironmentVariable ("MONO_MANAGED_WATCHER");
                                                
Environment.SetEnvironmentVariable ("MONO_MANAGED_WATCHER", "1");
                                        }
                                }
-                       } catch {
-                               // Ignore
+                       } catch (Exception e) {
+                               LoggingService.LogWarning ("There was a problem 
checking whether to use managed file watching", e);
                        }
                }
                

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to