Commit 20ddda10dcbb618522909fde74cbf7d77d2f60c8
2011-09-23T10:19:24
Autoselect a GPU from the menu if it's the only device.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
diff --git a/main.c b/main.c
index 09bbf84..d46ec35 100644
--- a/main.c
+++ b/main.c
@@ -3225,8 +3225,13 @@ retry:
wlogprint("Or press any other key to continue\n");
input = getch();
+ if (nDevs == 1)
+ selected = 0;
+ else
+ selected = -1;
if (!strncasecmp(&input, "e", 1)) {
- selected = curses_int("Select GPU to enable");
+ if (selected)
+ selected = curses_int("Select GPU to enable");
if (selected < 0 || selected >= nDevs) {
wlogprint("Invalid selection\n");
goto retry;
@@ -3251,7 +3256,8 @@ retry:
tq_push(thr->q, &ping);
}
} if (!strncasecmp(&input, "d", 1)) {
- selected = curses_int("Select GPU to disable");
+ if (selected)
+ selected = curses_int("Select GPU to disable");
if (selected < 0 || selected >= nDevs) {
wlogprint("Invalid selection\n");
goto retry;
@@ -3262,7 +3268,8 @@ retry:
}
gpu_devices[selected] = false;
} else if (!strncasecmp(&input, "r", 1)) {
- selected = curses_int("Select GPU to attempt to restart");
+ if (selected)
+ selected = curses_int("Select GPU to attempt to restart");
if (selected < 0 || selected >= nDevs) {
wlogprint("Invalid selection\n");
goto retry;
@@ -3270,12 +3277,14 @@ retry:
wlogprint("Attempting to restart threads of GPU %d\n", selected);
reinit_device(&gpus[selected]);
} else if (adl_active && (!strncasecmp(&input, "c", 1))) {
- selected = curses_int("Select GPU to change settings on");
+ if (selected)
+ selected = curses_int("Select GPU to change settings on");
if (selected < 0 || selected >= nDevs) {
wlogprint("Invalid selection\n");
goto retry;
}
change_gpusettings(selected);
+ goto retry;
} else
clear_logwin();