console: Fix password screen issue

Connect to remote URI, connect to VNC guest with password auth. Don't
enter password, just close the details window. Reopen the window,
password UI is still there, but it's no longer hooked up behind the
scenes. Fix it.
This commit is contained in:
Cole Robinson 2013-09-06 19:55:46 -04:00
parent 5bf63759b6
commit 0eab1706cc

View File

@ -1096,9 +1096,9 @@ class vmmConsolePages(vmmGObjectUI):
if self.viewer is None:
return
v = self.viewer # close_viewer() can be reentered
self.viewer = None
v = self.viewer
w = v.display
self.viewer = None
viewport = self.widget("console-gfx-viewport")
if w and w in viewport.get_children():
@ -1118,7 +1118,6 @@ class vmmConsolePages(vmmGObjectUI):
pages.set_current_page(CONSOLE_PAGE_UNAVAILABLE)
self.view_vm_status()
return
elif page in [CONSOLE_PAGE_UNAVAILABLE, CONSOLE_PAGE_VIEWER]:
if self.viewer and self.viewer.is_open():
@ -1210,14 +1209,14 @@ class vmmConsolePages(vmmGObjectUI):
self.tunnels.close_all()
self.tunnels = None
self.widget("console-pages").set_current_page(CONSOLE_PAGE_UNAVAILABLE)
self.close_viewer()
logging.debug("Viewer disconnected")
# Make sure modifiers are set correctly
self.viewer_focus_changed()
if (self.skip_connect_attempt() or
self.guest_not_avail()):
if self.guest_not_avail():
# Exit was probably for legitimate reasons
self.view_vm_status()
return