X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fconky.c;h=db3247c75436e437bfdf8558bf92cb2e7cd56638;hb=5b9d47c03915caea588b127c40ee64e6262c0c21;hp=1558dbb681da5ceecd4c916b41604903500c702c;hpb=9da5648d2a9fead8875c6661b91c16922545b4db;p=monky

diff --git a/src/conky.c b/src/conky.c
index 1558dbb..db3247c 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -3671,15 +3671,15 @@ static void generate_text_internal(char *p, int p_max_size,
 {
 	struct text_object *obj;
 
+	/* for the OBJ_top* handler */
+	struct process **needed = 0;
+
 #ifdef HAVE_ICONV
 	char buff_in[p_max_size];
 	buff_in[0] = 0;
 	iconv_converting = 0;
 #endif
 
-	/* for the OBJ_top* handler */
-	struct process **needed;
-
 	p[0] = 0;
 	for (obj = root.next; obj && p_max_size > 0; obj = obj->next) {
 
@@ -5124,11 +5124,11 @@ static void generate_text_internal(char *p, int p_max_size,
 			 * times, we have this special handler. */
 			break;
 			case OBJ_top:
-				needed = cur->cpu;
+				if (!needed) needed = cur->cpu;
 			case OBJ_top_mem:
-				needed = cur->memu;
+				if (!needed) needed = cur->memu;
 			case OBJ_top_time:
-				needed = cur->time;
+				if (!needed) needed = cur->time;
 
 				{
 					char *timeval;