Merge branch 'upstream' into dev

2 files changed, 4 insertions, 1 deletions

diff --git a/src/interface.c b/src/interface.c
index d020bf6..7975278 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -3898,6 +3898,7 @@ char *console_ui(pixel *vid_buf,char error[255]) { //TODO: error messages, show
 			if(ci==-1)
 			{
 				strcpy(ed.str, "");
+				ed.cursor = strlen(ed.str);
 			}
 			else
 			{
@@ -3910,11 +3911,13 @@ char *console_ui(pixel *vid_buf,char error[255]) { //TODO: error messages, show
 							currentcommand = currentcommand->prev_command;
 					}
 					strcpy(ed.str, currentcommand->command);
+					ed.cursor = strlen(ed.str);
 				}
 				else
 				{
 					ci = -1;
 					strcpy(ed.str, "");
+					ed.cursor = strlen(ed.str);
 				}
 			}
 		}
diff --git a/src/main.c b/src/main.c
index a3891d0..5b0f124 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1121,7 +1121,7 @@ int main(int argc, char *argv[])
 	pixel *pers_bg=calloc((XRES+BARSIZE)*YRES, PIXELSIZE);
 	void *http_ver_check;
 	char *ver_data=NULL, *tmp;
-	char error[255];
+	char error[255] = "";
 	int i, j, bq, fire_fc=0, do_check=0, old_version=0, http_ret=0, major, minor, old_ver_len;
 #ifdef INTERNAL
 	int vs = 0;