Better fix for OSX disk control->append disk crash

Makefile

@@ -89,7 +89,7 @@ else ifeq ($(platform), osx)
    fpic := -fPIC -mmacosx-version-min=10.6
    LDFLAGS :=
    SHARED := -dynamiclib
-   PLATFLAGS +=  -DRETRO -DALIGN_DWORD -D__MACOSX__
+   PLATFLAGS +=  -DRETRO -DALIGN_DWORD
 
 else ifeq ($(platform), android-armv7)
    CC = arm-linux-androideabi-gcc

sources/src/disk.c

@@ -1012,11 +1012,8 @@ static int drive_insert (drive * drv, struct uae_prefs *p, int dnum, const TCHAR
 	_tcsncpy (changed_prefs.floppyslots[dnum].df, fname, 255);
 	changed_prefs.floppyslots[dnum].df[255] = 0;
 	changed_prefs.floppyslots[dnum].forcedwriteprotect = forcedwriteprotect;
-#ifndef __MACOSX__
-	//FIXME: this following statement causes crash "Abort Trap: 6" on osx Retroarch
-	//when selecting quickmenu->disk control->append disk, no clue why.
-	_tcscpy (drv->newname, fname);
-#endif
+	if (drv->newname != fname)
+		_tcscpy (drv->newname, fname);
 	drv->newnamewriteprotected = forcedwriteprotect;
 	gui_filename (dnum, fname);