[03/28] fix display when the default display is not the clock

Message ID 1308256197-29155-3-git-send-email-daniel.lezcano@linaro.org
State Accepted
Headers show

Commit Message

Daniel Lezcano June 16, 2011, 8:29 p.m.
Due to an internal error in clocks.c I am investigating, I am
temporarly changing the test in the mainloop to have the clock
being initialized when the option is set.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 powerdebug.c |   44 +++++++++++++++++++++-----------------------
 1 files changed, 21 insertions(+), 23 deletions(-)

Patch

diff --git a/powerdebug.c b/powerdebug.c
index 4d55f17..3e0272f 100644
--- a/powerdebug.c
+++ b/powerdebug.c
@@ -259,29 +259,27 @@  int mainloop(struct powerdebug_options *options,
 					    options->verbose);
 		}
 
-		if (options->selectedwindow == CLOCK) {
-
-			if (options->clocks) {
-				int hrow;
-
-				create_selectedwindow(options->selectedwindow);
-				if (!findparent_ncurses) {
-					int command = 0;
-
-					if (enter_hit)
-						command = CLOCK_SELECTED;
-					if (refreshwin)
-						command = REFRESH_WINDOW;
-					hrow = read_and_print_clock_info(
-						options->verbose,
-						highlighted_row,
-						command);
-					highlighted_row = hrow;
-					enter_hit = false;
-				} else
-					find_parents_for_clock(clkname_str,
-							       enter_hit);
-			}
+		if (options->clocks || options->selectedwindow == CLOCK) {
+
+			int hrow;
+
+			create_selectedwindow(options->selectedwindow);
+			if (!findparent_ncurses) {
+				int command = 0;
+
+				if (enter_hit)
+					command = CLOCK_SELECTED;
+				if (refreshwin)
+					command = REFRESH_WINDOW;
+				hrow = read_and_print_clock_info(
+					options->verbose,
+					highlighted_row,
+					command);
+				highlighted_row = hrow;
+				enter_hit = false;
+			} else
+				find_parents_for_clock(clkname_str,
+						       enter_hit);
 		}
 
 		if (options->sensors || options->selectedwindow == SENSOR) {