Merge branch 'bacardi55'

2010-11-01 18:42:40 +01:00 · 2010-11-01 18:42:40 +01:00 · d242ab880a
commit d242ab880a
parent a0e5ddc45a 8f8d47dc23
1 changed files with 10 additions and 10 deletions
--- a/src/tag.c
+++ b/src/tag.c
@ -488,7 +488,16 @@ tag_new(int s, char *name)
 {
     char * displayedName;

-     if((!name || strlen(name) == 0))
+     if(conf.ntag[s] + 1 > MAXTAG)
+     {
+          warnx("Too many tag: Can't create new tag");
+
+          return;
+     }
+
+     ++conf.ntag[s];
+
+     if(!name || strlen(name) == 0)
     {
         if(conf.tagnamecount)
         {
@ -507,17 +516,8 @@ tag_new(int s, char *name)
               conf.default_tag.barpos, conf.default_tag.layout,
               0, NULL, 0 };

-     if(conf.ntag[s] + 1 > MAXTAG)
-     {
-          warnx("Too many tag: Can't create new tag");
-
-          return;
-     }
-
-     ++conf.ntag[s];

     tags[s][conf.ntag[s]] = t;
-/*     tags[s][conf.ntag[s]].name = _strdup(displayedName);*/

     infobar_update_taglist(s);
     infobar_draw(s);