--- /opt/bin/ecamonitor	2002-10-31 12:54:30.000000000 +0200
+++ ecamonitor	2002-10-31 13:18:27.000000000 +0200
@@ -137,15 +137,15 @@
 
         while 1:
             try:
-                pad.erase()
-                pad.addstr(0, 0, "ecamonitor v20021031-4", curses.A_BOLD)
+		pad.erase()
+		pad.addstr(0, 0, "ecamonitor v20021031-4", curses.A_BOLD)
 
                 if s == None:
                     pad.addstr(2, 0, "No connection. Trying to connect to " + ecamonitor_remote_host + ":" + str(ecamonitor_remote_port) + ".\n")
-                    pad.refresh(0, 0, 0, 0, stdscr.getmaxyx()[0], stdscr.getmaxyx()[1])
+                    pad.refresh(0, 0, 0, 0, stdscr.getmaxyx()[0]-1, stdscr.getmaxyx()[1]-1)
                     s = connect_to_server()
                     pad.addstr(3, 0, "Connection established.\n")
-                    pad.refresh(0, 0, 0, 0, stdscr.getmaxyx()[0], stdscr.getmaxyx()[1])
+                    pad.refresh(0, 0, 0, 0, stdscr.getmaxyx()[0]-1, stdscr.getmaxyx()[1]-1)
                     pad.addstr(1, 0, "")
                 else:
                     pad.addstr("\n")
@@ -188,12 +188,17 @@
 
                 pad.addstr("\n\n------------------------------------------------------------\n")
 
-                pad.refresh(0, 0, 0, 0, stdscr.getmaxyx()[0], stdscr.getmaxyx()[1])
+                pad.refresh(0, 0, 0, 0, stdscr.getmaxyx()[0]-1, stdscr.getmaxyx()[1]-1)
                 
                 time.sleep(1.0)
+		
+		ch=stdscr.getch()
+		
+		if ch==ord('q'):
+		    break
 
             except curses.error:
-                pass
+                raise
                 
             except socket.error, e:
                 if e[0] == 32 or e[0] == 104 or e[0] == 111: