[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[812] trunk/fuse

[<fr...@us...>]

Revision: 812
          http://sourceforge.net/p/fuse-for-macosx/code/812
Author:   fredm
Date:     2016-06-18 13:46:18 +0000 (Sat, 18 Jun 2016)
Log Message:
-----------
Fix writing disks (thanks, Tom Collier).

Modified Paths:
--------------
    trunk/fuse/fusepb/controllers/FuseController.m
    trunk/fuse/uimedia.c

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2016-06-08 11:16:43 UTC (rev 811)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2016-06-18 13:46:18 UTC (rev 812)
@@ -2441,6 +2441,10 @@
   /* We will be calling this from the Emulator thread */
   err = ui_media_drive_save_with_filename( drive_info, filename );
   
+  /* If we had a filename already it will only have been here - use the filename
+     we have used to write the file */
+  filename = drive_info->fdd->disk.filename;
+  
   [self addRecentSnapshotWithString:@(filename)];
   
   if( saveas == YES ) free( filename );

Modified: trunk/fuse/uimedia.c
===================================================================
--- trunk/fuse/uimedia.c	2016-06-08 11:16:43 UTC (rev 811)
+++ trunk/fuse/uimedia.c	2016-06-18 13:46:18 UTC (rev 812)
@@ -225,12 +225,7 @@
 int
 ui_media_drive_save( int which, int saveas )
 {
-  ui_media_drive_info_t *drive;
-
-  drive = ui_media_drive_find( which );
-  if( !drive )
-    return -1;
-  return ui_disk_write( drive, saveas );
+  return ui_disk_write( which, saveas );
 }
 
 static int

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.