diff options
author | Cole Robinson <crobinso@redhat.com> | 2013-10-06 15:30:01 -0400 |
---|---|---|
committer | Cole Robinson <crobinso@redhat.com> | 2013-12-05 15:52:30 -0500 |
commit | 9ed7681631ca66c4007ea2072553973d9764f4f0 (patch) | |
tree | a57a2de9d3649cfa9f0e9ae2cd7e82bb2107fdfc | |
parent | 766b9fb2addd40811ace0c2fd88fa2a13cee35af (diff) | |
download | virt-manager-v0.10.0-maint.tar.gz |
console: Fix console_active() logicv0.10.0-maint
(cherry picked from commit 79196cdfcf8f2ac58c87074c326ca3237f84dca6)
Conflicts:
virtManager/console.py
-rw-r--r-- | virtManager/console.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/virtManager/console.py b/virtManager/console.py index 90db31cf..8058af93 100644 --- a/virtManager/console.py +++ b/virtManager/console.py @@ -100,9 +100,9 @@ class ConnectionInfo(object): def console_active(self): if self.gsocket: return True - if not self.gport: + if (self.gport in [None, -1] and self.gtlsport in [None, -1]): return False - return int(self.gport) == -1 + return True class Tunnel(object): @@ -1129,7 +1129,7 @@ class vmmConsolePages(vmmGObjectUI): self.activate_unavailable_page(msg) return - if ginfo.console_active(): + if not ginfo.console_active(): self.activate_unavailable_page( _("Graphical console is not yet active for guest")) self.schedule_retry() |