From 2dfc0ee6b4ca45c2f9a385235b2d1f7786f38f1f Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden@rty.ca>
Date: Tue, 28 Apr 2009 10:54:43 -0600
Subject: [PATCH] Fix minor environment variable bug.

---
 src/conky.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/conky.c b/src/conky.c
index 86afd212..a4f156f1 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -2830,13 +2830,16 @@ static int extract_variable_text_internal(struct text_object *retval, const char
 				var = getenv(buf);
 				if (var) {
 					obj = create_plain_text(var);
-					if (obj)
+					if (obj) {
 						append_object(retval, obj);
+					}
 					continue;
 				}
 
 				/* if variable wasn't found in environment, use some special */
 
+				arg = 0;
+
 				/* split arg */
 				if (strchr(buf, ' ')) {
 					arg = strchr(buf, ' ');
@@ -2953,7 +2956,7 @@ static inline struct mail_s *ensure_mail_thread(struct text_object *obj,
 		// something is wrong, warn once then stop
 		ERR("There's a problem with your mail settings.  "
 				"Check that the global mail settings are properly defined"
-				"(line %li).", obj->line);
+				" (line %li).", obj->line);
 		obj->a++;
 	}
 	return NULL;