X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fspecials.c;h=3fa6e0b4710a92787696ae33102d415f63fd4bc9;hb=349f5fc1c69755e942eb1616501fada58f17136c;hp=9a30b669d0879212f2403336653496f4f0723235;hpb=970420106cbfbc56676f291a6eb97b5175064c51;p=monky

diff --git a/src/specials.c b/src/specials.c
index 9a30b66..3fa6e0b 100644
--- a/src/specials.c
+++ b/src/specials.c
@@ -10,7 +10,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *	(see AUTHORS)
  * All rights reserved.
  *
@@ -324,7 +324,6 @@ static void graph_append(struct special_t *graph, double f, char showaslog)
 		f = graph->graph_scale;
 	}
 
-	graph->graph[0] = f;	/* add new data */
 	/* shift all the data by 1 */
 	for (i = graph->graph_width - 1; i > 0; i--) {
 		graph->graph[i] = graph->graph[i - 1];
@@ -333,9 +332,10 @@ static void graph_append(struct special_t *graph, double f, char showaslog)
 			graph->graph_scale = graph->graph[i - 1];
 		}
 	}
-	if (graph->scaled && graph->graph[graph->graph_width] > graph->graph_scale) {
+	graph->graph[0] = f;	/* add new data */
+	if (graph->scaled && graph->graph[0] > graph->graph_scale) {
 		/* check if we need to update the scale */
-		graph->graph_scale = graph->graph[graph->graph_width];
+		graph->graph_scale = graph->graph[0];
 	}
 }
 
@@ -491,17 +491,11 @@ static void new_bar_in_x11(struct text_object *obj, char *buf, int usage)
 	struct special_t *s = 0;
 	struct bar *b = obj->special_data;
 
-	if ((output_methods & TO_X) == 0)
-		return;
-
-	if (!b)
-		return;
-
 	s = new_special(buf, BAR);
 
 	s->arg = usage;
-	s->width = b->width;
-	s->height = b->height;
+	s->width = b ?  b->width : default_bar_width;
+	s->height = b ? b->height : default_bar_height;
 }
 #endif /* X11 */