--- hatari/src/gui-sdl/dlgNewDisk.c	2019/04/01 07:13:51	1.1.1.1
+++ hatari/src/gui-sdl/dlgNewDisk.c	2019/04/09 08:47:27	1.1.1.4
@@ -4,7 +4,7 @@
   This file is distributed under the GNU Public License, version 2 or at
   your option any later version. Read the file gpl.txt for details.
 */
-const char DlgNewDisk_rcsid[] = "Hatari $Id: dlgNewDisk.c,v 1.1.1.1 2019/04/01 07:13:51 root Exp $";
+const char DlgNewDisk_fileid[] = "Hatari dlgNewDisk.c : " __DATE__ " " __TIME__;
 
 #include "main.h"
 #include "configuration.h"
@@ -64,14 +64,9 @@ void DlgNewDisk_Main(void)
  	SDLGui_CenterDlg(newdiskdlg);
 
 	/* Initialize disk image name: */
-	szNewDiskName = malloc(strlen(DialogParams.DiskImage.szDiskImageDirectory) + strlen(DEFAULT_DISK_NAME) + 1);
+	szNewDiskName = File_MakePath(ConfigureParams.DiskImage.szDiskImageDirectory, "new_disk.st", NULL);
 	if (!szNewDiskName)
-	{
-		perror("DlgNewDisk_Main");
 		return;
-	}
-	strcpy(szNewDiskName, DialogParams.DiskImage.szDiskImageDirectory);
-	strcat(szNewDiskName, "new_disk.st");
 
 	/* Draw and process the dialog */
 	do
@@ -90,10 +85,11 @@ void DlgNewDisk_Main(void)
 			sprintf(szTracks, "%i", nTracks);
 			break;
 		 case DLGNEWDISK_SAVE:
-			tmpname = SDLGui_FileSelect(szNewDiskName, NULL, TRUE);
+			tmpname = SDLGui_FileSelect(szNewDiskName, NULL, true);
 			if (tmpname)
 			{
-				if (!File_DoesFileNameEndWithSlash(tmpname))
+				/* (potentially non-existing) filename? */
+				if (!File_DirExists(tmpname))
 				{
 					int nSectors, nSides;