Wrapp connect/disconnect methods for VNC in a try..except block

This commit is contained in:
Daniel P. Berrange 2006-07-20 12:51:15 -04:00
parent 79b4531a54
commit a3df1fb344

View File

@ -112,7 +112,10 @@ class vmmConsole(gobject.GObject):
def close(self,ignore1=None,ignore2=None): def close(self,ignore1=None,ignore2=None):
self.window.get_widget("vmm-console").hide() self.window.get_widget("vmm-console").hide()
if self.vncViewer.is_connected(): if self.vncViewer.is_connected():
try:
self.vncViewer.disconnect_from_host() self.vncViewer.disconnect_from_host()
except:
print "Failure when disconnecting"
return 1 return 1
def control_vm_run(self, src): def control_vm_run(self, src):
@ -123,7 +126,6 @@ class vmmConsole(gobject.GObject):
def try_login(self, src=None): def try_login(self, src=None):
password = self.window.get_widget("console-auth-password").get_text() password = self.window.get_widget("console-auth-password").get_text()
protocol, host, port = self.vm.get_console_info() protocol, host, port = self.vm.get_console_info()
if self.vm.get_id() == 0: if self.vm.get_id() == 0:
@ -135,8 +137,12 @@ class vmmConsole(gobject.GObject):
return return
if not(self.vncViewer.is_connected()): if not(self.vncViewer.is_connected()):
try:
self.vncViewer.connect_to_host(host, port) self.vncViewer.connect_to_host(host, port)
except:
print "Unable to activate console"
self.activate_unavailable_page()
return
if self.vncViewer.is_authenticated(): if self.vncViewer.is_authenticated():
self.activate_viewer_page() self.activate_viewer_page()
elif password: elif password: