remove X11 startup from vmmanager
authorBarthaM@N3SIM1218.D03.arc.local
Mon, 19 May 2014 16:43:11 +0100
changeset 162c1c9ccd9d7c8
parent 161 588a83322e4e
child 163 e7fbdaabd0bc
remove X11 startup from vmmanager
OpenSecurity/bin/vmmanager.pyw
     1.1 --- a/OpenSecurity/bin/vmmanager.pyw	Mon May 19 16:43:21 2014 +0200
     1.2 +++ b/OpenSecurity/bin/vmmanager.pyw	Mon May 19 16:43:11 2014 +0100
     1.3 @@ -580,8 +580,10 @@
     1.4          
     1.5      def run(self):
     1.6          browser = '\\\"/usr/bin/chromium; pidof dbus-launch | xargs kill\\\"'
     1.7 -        if Cygwin.is_X11_running()==False:
     1.8 -            Cygwin.start_X11()
     1.9 +        if not Cygwin.is_X11_running():
    1.10 +            self.vmm.browsingManager.restart.set()
    1.11 +            return
    1.12 +        
    1.13          try:
    1.14              self.vmm.browsingManager.started.wait() 
    1.15              result = Cygwin.checkResult(Cygwin.sshExecuteX11(browser, self.vmm.browsingManager.ip_addr, 'osecuser', Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vmm.browsingManager.vm_name + '/dvm_key'))