fix typo and prevent race in cleanup

git-svn-id: https://xpra.org/svn/Xpra/trunk@8908 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Apr 3, 2015 · f58dbe4 · f58dbe4
1 parent 62f8409
commit f58dbe4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/xpra/net/subprocess_wrapper.py b/src/xpra/net/subprocess_wrapper.py
@@ -44,7 +44,7 @@
 #        gtk.main()
 #    def quit(self):
 #        gtk.main_quit()
-mainloop = gobject.mainloop
+mainloop = gobject.MainLoop
 
 
 class subprocess_callee(object):
@@ -288,9 +288,9 @@ def stop(self):
                 log.warn("failed to stop the wrapped subprocess %s: %s", proc, e)
         p = self.protocol
         if p:
+            self.protocol = None
             try:
                 p.close()
-                self.protocol = None
             except Exception as e:
                 log.warn("failed to close the subprocess connection: %s", p, e)