Fix using the console in Windows, but only in command-line mode
This commit is contained in:
parent
b9d2094a15
commit
a4e8d1eb46
|
@ -33,7 +33,10 @@
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
import curses
|
try:
|
||||||
|
import curses
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
||||||
colors = [
|
colors = [
|
||||||
'COLOR_BLACK',
|
'COLOR_BLACK',
|
||||||
|
|
|
@ -185,11 +185,14 @@ class ConsoleUI(component.Component):
|
||||||
d.addCallback(on_connect)
|
d.addCallback(on_connect)
|
||||||
|
|
||||||
self.coreconfig = CoreConfig()
|
self.coreconfig = CoreConfig()
|
||||||
if self.interactive:
|
if self.interactive and not deluge.common.windows_check():
|
||||||
# We use the curses.wrapper function to prevent the console from getting
|
# We use the curses.wrapper function to prevent the console from getting
|
||||||
# messed up if an uncaught exception is experienced.
|
# messed up if an uncaught exception is experienced.
|
||||||
import curses.wrapper
|
import curses.wrapper
|
||||||
curses.wrapper(self.run)
|
curses.wrapper(self.run)
|
||||||
|
elif self.interactive and deluge.common.windows_check():
|
||||||
|
print "You cannot run the deluge-console in interactive mode in Windows.\
|
||||||
|
Please use commands from the command line, eg: deluge-console config;help;exit"
|
||||||
else:
|
else:
|
||||||
reactor.run()
|
reactor.run()
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,11 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import curses
|
try:
|
||||||
|
import curses
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
||||||
import colors
|
import colors
|
||||||
try:
|
try:
|
||||||
import signal
|
import signal
|
||||||
|
|
Loading…
Reference in New Issue