More custom hackery to deal with issues discovered in sysinstall.

3 files changed, 14 insertions, 17 deletions

diff --git a/gnu/lib/libdialog/checklist.c b/gnu/lib/libdialog/checklist.c
index 7714d3888c6b..bd88057f3337 100644
--- a/gnu/lib/libdialog/checklist.c
+++ b/gnu/lib/libdialog/checklist.c
@@ -333,18 +333,17 @@ draw:
 					 cur_x, cur_y);
 			    wrefresh(dialog);
 			}
-			else if (st & DITEM_RECREATE) {
-			    delwin(save);
-			    delwin(list);
-			    delwin(dialog);
-			    goto draw;
-			}
 			delwin(save);
 			if (st & DITEM_LEAVE_MENU) {
 			    /* Allow a fire action to take us out of the menu */
 			    key = ESC;
 			    break;
 			}
+			else if (st & DITEM_RECREATE) {
+			    delwin(list);
+			    delwin(dialog);
+			    goto draw;
+			}
 		    }
 		    status[scroll + choice] = ditems[scroll + choice].checked ?
 			ditems[scroll + choice].checked(&ditems[scroll + choice]) : FALSE;
diff --git a/gnu/lib/libdialog/menubox.c b/gnu/lib/libdialog/menubox.c
index fde4fc6e73b8..2044db1e10a2 100644
--- a/gnu/lib/libdialog/menubox.c
+++ b/gnu/lib/libdialog/menubox.c
@@ -389,15 +389,14 @@ draw:
 			touchwin(save);
 			wrefresh(save);
 		    }
-		    if (status & DITEM_RECREATE) {
+		    delwin(save);
+		    if (status & DITEM_CONTINUE)
+			continue;
+		    else if (status & DITEM_RECREATE || !(status & DITEM_LEAVE_MENU)) {
 			delwin(menu);
 			delwin(dialog);
-			delwin(save);
 			goto draw;
 		    }
-		    delwin(save);
-		    if (status & DITEM_CONTINUE)
-			continue;
 		}
 		else if (result)
 		    strcpy(result, items[(scroll+choice)*2]);
diff --git a/gnu/lib/libdialog/radiolist.c b/gnu/lib/libdialog/radiolist.c
index 0361fe2229df..c40e8519ebb4 100644
--- a/gnu/lib/libdialog/radiolist.c
+++ b/gnu/lib/libdialog/radiolist.c
@@ -338,18 +338,17 @@ draw:
 			    wmove(dialog, cur_y, cur_x);  /* Restore cursor to previous position */
 			    wrefresh(dialog);
 			}
-			else if (st & DITEM_RECREATE) {
-			    delwin(save);
-			    delwin(list);
-			    delwin(dialog);
-			    goto draw;
-			}
 			delwin(save);
 			if (st & DITEM_LEAVE_MENU) {
 			    /* Allow a fire action to take us out of the menu */
 			    key = ESC;
 			    break;
 			}
+			else if (st & DITEM_RECREATE) {
+			    delwin(list);
+			    delwin(dialog);
+			    goto draw;
+			}
 		    }
 		    for (i = 0; i < item_no; i++)
 			status[i] = ditems[i].checked ? ditems[i].checked(&ditems[i]) : FALSE;