misc tweaks

1 files changed, 7 insertions, 8 deletions

diff --git a/xenscreen.c b/xenscreen.c
index 76e7893..94d4961 100644
--- a/xenscreen.c
+++ b/xenscreen.c
@@ -217,7 +217,7 @@ static void usage(FILE *fp)
 	    "usage: xenscreen [options]\n"
 	    "options:\n"
 	    "   -h            print this text\n"
-	    "   -b            print builtin screen config file\n"
+	    "   -b            print default screen config file\n"
 	    "   -L            enable console output logging\n"
 	    "   -c screenrc   screen config file              [%s]\n"
 	    "   -S session    screen session name             [%s]\n"
@@ -287,7 +287,7 @@ int main(int argc, char *argv[])
 	    /* try to attach */
 	    rc = run_application(1, "screen", "screen",
 				 "-S", screen_session,
-				 "-r", "-p", "=",
+				 "-r", "-p", screen_window ?: "=",
 				 NULL);
 	    if (0 == rc)
 		exit(0);
@@ -339,8 +339,8 @@ int main(int argc, char *argv[])
 
     fprintf(stderr,
 	    "###\n"
-	    "### Xen consoles in screen\n"
-	    "### This is the watch process\n"
+	    "### Managing Xen consoles using screen.\n"
+	    "### This is the monitor process.\n"
 	    "###\n"
 	    "\n");
 
@@ -371,12 +371,11 @@ int main(int argc, char *argv[])
 	try_attach_screen(dom, 1);
     }
 
-    if (screen_window)
-	rc = screen_command("select", screen_window, NULL);
-    if (!screen_window || 0 != rc) {
+    if (!screen_window) {
 	rc = screen_command("select", "0", NULL);
 	rc = screen_command("windowlist", "-b", NULL);
-    }
+    } else
+	rc = screen_command("select", screen_window, NULL);
 
     /* main loop */
     fprintf(stderr,"ok, watching out for changes now\n");