fixed a bug when dmenu is run with -v

diff --git a/config.mk b/config.mk
index a0ef56a..7ae7dde 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dmenu version
 # dmenu version

-VERSION = 2.4.2
+VERSION = 2.5

 
 # Customize below to fit your system
 
 
 # Customize below to fit your system
 

diff --git a/main.c b/main.c
index c1d48dd..cd0e2b5 100644 (file)
--- a/main.c
+++ b/main.c
@@ -418,7 +418,9 @@ main(int argc, char *argv[]) {
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;
 
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;
 

-       if(isatty(STDIN_FILENO)) {
+       if(argc == 2 && !strncmp("-v", argv[1], 3))
+               eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
+       else if(isatty(STDIN_FILENO)) {

                fputs("error: dmenu can't run in an interactive shell\n", stdout);
                usage();
        }
                fputs("error: dmenu can't run in an interactive shell\n", stdout);
                usage();
        }


@@ -445,8 +447,6 @@ main(int argc, char *argv[]) {
                else if(!strncmp(argv[i], "-sf", 4)) {
                        if(++i < argc) selfg = argv[i];
                }
                else if(!strncmp(argv[i], "-sf", 4)) {
                        if(++i < argc) selfg = argv[i];
                }

-               else if(!strncmp(argv[i], "-v", 3))
-                       eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");

                else
                        usage();
        setlocale(LC_CTYPE, "");
                else
                        usage();
        setlocale(LC_CTYPE, "");