TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Windows build of menu.cpp

Browse source 
Commit 6ad87cf78ab3 removed support for char[] as an input to
nm_item_input and fixed all sites that used it in the cross-platform
build.  The Windows build has one use that no other platform does, and
this use was not fixed.  Fix it now.

Fixes: 6ad87cf78ab369cdc26080ac579fb2ab3f592de6 ("Remove nm_set_item_input overload for char[]")
This commit is contained in:
Kp 2021-04-04 22:01:25 +00:00
parent 1843ed752c
commit 6666928824
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
similar/main/menu.cpp
View file

@ -2248,17 +2248,17 @@ window_event_result browser::callback_handler(const d_event &event, window_event
{ {
if (event_key_get(event) == KEY_CTRLED + KEY_D) if (event_key_get(event) == KEY_CTRLED + KEY_D)
{ {
char text[4] = "c"; std::array<char, 4> text{{"c"}};
int rval = 0; int rval = 0;
std::array<newmenu_item, 1> m{{ std::array<newmenu_item, 1> m{{
nm_item_input(text), nm_item_input(text),
}}; }};
rval = newmenu_do2(menu_title{nullptr}, menu_subtitle{"Enter drive letter"}, m, unused_newmenu_subfunction, unused_newmenu_userdata); rval = newmenu_do2(menu_title{nullptr}, menu_subtitle{"Enter drive letter"}, m, unused_newmenu_subfunction, unused_newmenu_userdata);
text[1] = '\0'; const auto t0 = text[0];
std::array<char, PATH_MAX> newpath; std::array<char, PATH_MAX> newpath;
snprintf(newpath.data(), newpath.size(), "%s:%s", text, sep); snprintf(newpath.data(), newpath.size(), "%c:%s", t0, sep);
if (!rval && text[0]) if (!rval && t0)
{ {
select_file_recursive(title, newpath, ext_range, select_dir, userdata); select_file_recursive(title, newpath, ext_range, select_dir, userdata);
// close old box. // close old box.