jhbuild r2032 - in trunk: . jhbuild/utils

[malureau svn gnome org]

Author: malureau
Date: Thu Apr 17 23:15:01 2008
New Revision: 2032
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2032&view=rev

Log:
2008-04-17  Marc-Andre Lureau  <marcandre lureau gmail com>

	* jhbuild/utils/trayicon.py (TrayIcon.close): Don't break if the
	process does not exists anymore. See #526745.


Modified:
   trunk/ChangeLog
   trunk/jhbuild/utils/trayicon.py

Modified: trunk/jhbuild/utils/trayicon.py
==============================================================================
--- trunk/jhbuild/utils/trayicon.py	(original)
+++ trunk/jhbuild/utils/trayicon.py	Thu Apr 17 23:15:01 2008
@@ -57,7 +57,10 @@
         status = None
         if self.proc:
             self.proc.stdin.close()
-            os.kill(self.proc.pid, signal.SIGTERM)
+            try:
+                os.kill(self.proc.pid, signal.SIGTERM)
+            except OSError:
+                pass
             status = self.proc.wait()
             self.proc = None
         return status