Fixed bug for single folder search results.
This commit is contained in:
parent
03eb1a5d56
commit
50db610fc8
|
@ -523,6 +523,7 @@ boolean preparefilemenu(boolean samedepth)
|
||||||
struct stat fsstat;
|
struct stat fsstat;
|
||||||
size_t pos = 0, folderpos = 0, numfolders = 0, rejected = 0;
|
size_t pos = 0, folderpos = 0, numfolders = 0, rejected = 0;
|
||||||
char *tempname = NULL;
|
char *tempname = NULL;
|
||||||
|
boolean noresults = false;
|
||||||
|
|
||||||
if (samedepth)
|
if (samedepth)
|
||||||
{
|
{
|
||||||
|
@ -588,7 +589,7 @@ boolean preparefilemenu(boolean samedepth)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((menusearch[0] && !sizedirmenu)
|
if (((noresults = (menusearch[0] && !sizedirmenu)))
|
||||||
|| (!menusearch[0] && menudepthleft != menudepth-1)) // Make room for UP... or search entry
|
|| (!menusearch[0] && menudepthleft != menudepth-1)) // Make room for UP... or search entry
|
||||||
{
|
{
|
||||||
sizedirmenu++;
|
sizedirmenu++;
|
||||||
|
@ -683,12 +684,9 @@ boolean preparefilemenu(boolean samedepth)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (menusearch[0])
|
if (noresults) // no results
|
||||||
{
|
|
||||||
if (!pos && folderpos == 1)
|
|
||||||
dirmenu[0] = Z_StrDup(va("%c\13No results...", EXT_NORESULTS));
|
dirmenu[0] = Z_StrDup(va("%c\13No results...", EXT_NORESULTS));
|
||||||
}
|
else if (!menusearch[0] &&menudepthleft != menudepth-1) // now for UP... entry
|
||||||
else if (menudepthleft != menudepth-1) // now for UP... entry
|
|
||||||
dirmenu[0] = Z_StrDup(va("%c\5UP...", EXT_UP));
|
dirmenu[0] = Z_StrDup(va("%c\5UP...", EXT_UP));
|
||||||
|
|
||||||
menupath[menupathindex[menudepthleft]] = 0;
|
menupath[menupathindex[menudepthleft]] = 0;
|
||||||
|
|
Loading…
Reference in a new issue