* main.c (handler): Prepends error message with "ERROR: ".

Displays error in message bar. Returns 0.

* events.c (destroy_window): sets rp_current_window to NULL when
there are no more mapped windows.
(destroy_window): calls set_current_window and find_window_other
directly instead of cmd_other.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/main.c b/src/main.c
index 4034404..97a61f8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -118,10 +118,15 @@ handler (Display *d, XErrorEvent *e)
 
   if (ignore_badwindow && e->error_code == BadWindow) return 0;
 
-  XGetErrorText (d, e->error_code, error_msg, sizeof (error_msg));
+  strcpy (error_msg, "ERROR: ");
+
+  XGetErrorText (d, e->error_code, error_msg + 7, sizeof (error_msg) - 7);
   fprintf (stderr, "ratpoison: %s!\n", error_msg);
 
-  exit (EXIT_FAILURE); 
+  marked_message (error_msg, 0, strlen (error_msg));
+
+/*   exit (EXIT_FAILURE);  */
+  return 0;
 }
 
 void