--- hatari/src/gui-sdl/dlgNewDisc.c 2019/04/01 07:11:38 1.1.1.1 +++ hatari/src/gui-sdl/dlgNewDisc.c 2019/04/01 07:12:21 1.1.1.2 @@ -4,14 +4,13 @@ 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. */ -char DlgNewDisc_rcsid[] = "Hatari $Id: dlgNewDisc.c,v 1.1.1.1 2019/04/01 07:11:38 root Exp $"; +char DlgNewDisc_rcsid[] = "Hatari $Id: dlgNewDisc.c,v 1.1.1.2 2019/04/01 07:12:21 root Exp $"; #include "main.h" #include "configuration.h" #include "createBlankImage.h" #include "dialog.h" #include "sdlgui.h" -#include "memAlloc.h" #include "file.h" @@ -65,7 +64,12 @@ void DlgNewDisc_Main(void) SDLGui_CenterDlg(newdiscdlg); /* Initialize disc image name: */ - szNewDiscName = Memory_Alloc(FILENAME_MAX); + szNewDiscName = malloc(FILENAME_MAX); + if (!szNewDiscName) + { + perror("DlgNewDisc_Main"); + return; + } strcpy(szNewDiscName, DialogParams.DiscImage.szDiscImageDirectory); if (strlen(szNewDiscName) < FILENAME_MAX-12) strcat(szNewDiscName, "new_disc.st"); @@ -73,7 +77,7 @@ void DlgNewDisc_Main(void) /* Draw and process the dialog */ do { - but = SDLGui_DoDialog(newdiscdlg); + but = SDLGui_DoDialog(newdiscdlg, NULL); switch(but) { case DLGNEWDISC_DECTRACK: @@ -113,7 +117,7 @@ void DlgNewDisc_Main(void) break; } } - while (but != DLGNEWDISC_EXIT && !bQuitProgram); + while (but != DLGNEWDISC_EXIT && but != SDLGUI_QUIT && !bQuitProgram); - Memory_Free(szNewDiscName); + free(szNewDiscName); }