Merge branch 'bacardi55'

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);

src/wmfs.c

@@ -282,7 +282,8 @@ uicb_reload(uicb_t cmd)
 
      for(; argv_global[0] && argv_global[0] == ' '; ++argv_global);
 
-     execlp(argv_global, argv_global, NULL);
+     // add -C to always load the same config file
+     execlp(argv_global, argv_global, "-C", conf.confpath, NULL);
 
      return;
 }