diff gui/win32/interface.c @ 33770:6134493605c6

Use macro nfree() in Win32 GUI code.

--- a/gui/win32/interface.c	Sat Jul 09 10:39:33 2011 +0000
+++ b/gui/win32/interface.c	Sat Jul 09 11:11:52 2011 +0000
@@ -50,6 +50,7 @@
 #include "libmpcodecs/dec_audio.h"
 #include "gui/ui/actions.h"
 #include "gui/ui/gmplayer.h"
+#include "gui/util/mem.h"
 #include "gui/util/list.h"
 #include "gui/util/string.h"
 #include "mp_core.h"
@@ -409,10 +410,8 @@
         setddup(&guiInfo.Filename, dir, name);
 
     guiInfo.StreamType = type;
-    free(guiInfo.AudioFile);
-    guiInfo.AudioFile = NULL;
-    free(guiInfo.Subtitlename);
-    guiInfo.Subtitlename = NULL;
+    nfree(guiInfo.AudioFile);
+    nfree(guiInfo.Subtitlename);
 }
 
 void uiFullScreen( void )
@@ -488,8 +487,7 @@
         WaitForSingleObject(hThread, INFINITE);
         CloseHandle(hThread);
         mygui->uninit(mygui);
-        free(mygui);
-        mygui = NULL;
+        nfree(mygui);
     }
     /* Remove tray icon */
     Shell_NotifyIcon(NIM_DELETE, &nid);
@@ -651,8 +649,7 @@
                 case MP_CMD_QUIT:
                 {
                     mygui->uninit(mygui);
-                    free(mygui);
-                    mygui = NULL;
+                    nfree(mygui);
                     exit_player(EXIT_QUIT);
                     return 1;
                 }