summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2011-10-24 01:46:07 +0200
committerhut <hut@lavabit.com>2011-10-24 01:46:07 +0200
commit0bb7e10bf614cb289d04d1da0ee1480c2cb6795e (patch)
treea03fe4971a961ae6f3185a9f2345254f2cf61996
parent6e7e38b94ac1908fc4e027c805a0fb9b987608df (diff)
downloadranger-0bb7e10bf614cb289d04d1da0ee1480c2cb6795e.tar.gz
gui.curses_shortcuts: Fix 97e724a3 for addstr() with one argument
-rw-r--r--ranger/gui/curses_shortcuts.py18
-rw-r--r--ranger/gui/widgets/console.py4
2 files changed, 12 insertions, 10 deletions
diff --git a/ranger/gui/curses_shortcuts.py b/ranger/gui/curses_shortcuts.py
index 4a3bb4b9..10a159a1 100644
--- a/ranger/gui/curses_shortcuts.py
+++ b/ranger/gui/curses_shortcuts.py
@@ -39,19 +39,21 @@ class CursesShortcuts(SettingsAware):
 		try:
 			self.win.addstr(*args)
 		except:
-			try:
-				self.win.addstr(*_fix_surrogates(args))
-			except:
-				pass
+			if len(args) > 1:
+				try:
+					self.win.addstr(*_fix_surrogates(args))
+				except:
+					pass
 
 	def addnstr(self, *args):
 		try:
 			self.win.addnstr(*args)
 		except:
-			try:
-				self.win.addnstr(*_fix_surrogates(args))
-			except:
-				pass
+			if len(args) > 2:
+				try:
+					self.win.addnstr(*_fix_surrogates(args))
+				except:
+					pass
 
 	def addch(self, *args):
 		try:
diff --git a/ranger/gui/widgets/console.py b/ranger/gui/widgets/console.py
index 406a2fe9..2376ba5a 100644
--- a/ranger/gui/widgets/console.py
+++ b/ranger/gui/widgets/console.py
@@ -79,9 +79,9 @@ class Console(Widget):
 		line = WideString(self.line)
 		overflow = -self.wid + len(self.prompt) + len(line) + 1
 		if overflow > 0: 
-			self.addstr(str(line[overflow:]))
+			self.addstr(0, len(self.prompt), str(line[overflow:]))
 		else:
-			self.addstr(self.line)
+			self.addstr(0, len(self.prompt), self.line)
 
 	def finalize(self):
 		try: