New upstream version 5.1.0upstream/5.1.0

1 files changed, 18 insertions, 13 deletions

diff --git a/app/bin/denum.c b/app/bin/denum.c
index d27a135..b353627 100644
--- a/app/bin/denum.c
+++ b/app/bin/denum.c
@@ -20,16 +20,18 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <assert.h>
+#include <string.h>
 #include <time.h>
-#include "track.h"
-#include "i18n.h"
-
-/****************************************************************************
- *
- * ENUMERATE
- *
- */
 
+#include "custom.h"
+#include "fileio.h"
+#include "layout.h"
+#include "i18n.h"
+#include "param.h"
+#include "paths.h"
+#include "track.h"
+#include "utility.h"
 
 static wWin_p enumW;
 
@@ -37,6 +39,9 @@ static wWin_p enumW;
 #define ENUMOP_PRINT	(5)
 #define ENUMOP_CLOSE	(6)
 
+#undef max
+#define max(a,b)            (((a) > (b)) ? (a) : (b))
+
 static void DoEnumOp( void * );
 static long enableListPrices;
 
@@ -83,7 +88,7 @@ static void DoEnumOp(
 {
 	switch( (int)(long)data ) {
 	case ENUMOP_SAVE:
-		wFilSelect( enumFile_fs, curDirName );
+		wFilSelect( enumFile_fs, GetCurrentPath(PARTLISTPATHKEY) );
 		break;
 	case ENUMOP_PRINT:
 		wTextPrint( enumT );
@@ -151,13 +156,13 @@ void EnumerateStart(void)
 
 	message[0] = '\0';
 	cp = message;
-	if ( Title1[0] ) {
-		strcpy( cp, Title1 );
+	if ( *GetLayoutTitle() ) {
+		strcpy( cp, GetLayoutTitle() );
 		cp += strlen(cp);
 		*cp++ = '\n';
 	}
-	if ( Title2[0] ) {
-		strcpy( cp, Title2 );
+	if ( *GetLayoutSubtitle() ) {
+		strcpy( cp, GetLayoutSubtitle());
 		cp += strlen(cp);
 		*cp++ = '\n';
 	}