From 50db610fc8ce32ec9fc11f3951dde5d8740e940e Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Sat, 29 Apr 2017 16:40:07 +0100
Subject: [PATCH] Fixed bug for single folder search results.

---
 src/filesrch.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/filesrch.c b/src/filesrch.c
index e9e34e3e9..d0c97c498 100644
--- a/src/filesrch.c
+++ b/src/filesrch.c
@@ -523,6 +523,7 @@ boolean preparefilemenu(boolean samedepth)
 	struct stat fsstat;
 	size_t pos = 0, folderpos = 0, numfolders = 0, rejected = 0;
 	char *tempname = NULL;
+	boolean noresults = false;
 
 	if (samedepth)
 	{
@@ -588,7 +589,7 @@ boolean preparefilemenu(boolean samedepth)
 		return false;
 	}
 
-	if ((menusearch[0] && !sizedirmenu)
+	if (((noresults = (menusearch[0] && !sizedirmenu)))
 		|| (!menusearch[0] && menudepthleft != menudepth-1)) // Make room for UP... or search entry
 	{
 		sizedirmenu++;
@@ -683,12 +684,9 @@ boolean preparefilemenu(boolean samedepth)
 		}
 	}
 
-	if (menusearch[0])
-	{
-		if (!pos && folderpos == 1)
-			dirmenu[0] = Z_StrDup(va("%c\13No results...", EXT_NORESULTS));
-	}
-	else if (menudepthleft != menudepth-1) // now for UP... entry
+	if (noresults) // no results
+		dirmenu[0] = Z_StrDup(va("%c\13No results...", EXT_NORESULTS));
+	else if (!menusearch[0] &&menudepthleft != menudepth-1) // now for UP... entry
 		dirmenu[0] = Z_StrDup(va("%c\5UP...", EXT_UP));
 
 	menupath[menupathindex[menudepthleft]] = 0;