From c87b1b8fc894dd9db6b2272d4ce6b309905fdc98 Mon Sep 17 00:00:00 2001
From: okan
Date: Thu, 5 Jun 2008 00:07:05 +0000
Subject: actually honor termpath and lockpath if specified in cwmrc.

"now" oga@
---
 conf.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'conf.c')

diff --git a/conf.c b/conf.c
index 7cd5d2b..96dd723 100644
--- a/conf.c
+++ b/conf.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: conf.c,v 1.35 2008/05/19 18:53:09 oga Exp $
+ * $Id: conf.c,v 1.36 2008/06/05 00:07:05 okan Exp $
  */
 
 #include "headers.h"
@@ -36,11 +36,11 @@ conf_cmd_add(struct conf *c, char *image, char *label, int flags)
 {
 	/* "term" and "lock" have special meanings. */
 
-	if (strcmp(label, "term") == 0) {
-		strlcpy(Conf.termpath, image, sizeof(Conf.termpath));
-	} else if (strcmp(label, "lock") == 0) {
-		strlcpy(Conf.lockpath, image, sizeof(Conf.lockpath));
-	} else {
+	if (strcmp(label, "term") == 0)
+		strlcpy(c->termpath, image, sizeof(c->termpath));
+	else if (strcmp(label, "lock") == 0)
+		strlcpy(c->lockpath, image, sizeof(c->lockpath));
+	else {
 		struct cmd *cmd;
 		XMALLOC(cmd, struct cmd);
 		cmd->flags = flags;
-- 
cgit v1.2.3-2-gb3c3