summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2006-11-06 13:04:51 +0000
committerAlexander Larsson <alexl@src.gnome.org>2006-11-06 13:04:51 +0000
commit6529dfeb752b5b5311ac89e2493eb9237ecbdd36 (patch)
treed7ee712ecae0dec5d1db4d4046b1f3eefe040be8
parent6246b5ccffe96b9aa893e4379a0e2775d27e6775 (diff)
downloadnautilus-6529dfeb752b5b5311ac89e2493eb9237ecbdd36.tar.gz
Don't close handle and free buffer twice on error. (#321175)
2006-11-06 Alexander Larsson <alexl@redhat.com> * src/file-manager/fm-icon-view.c (play_file): Don't close handle and free buffer twice on error. (#321175)
-rw-r--r--ChangeLog5
-rw-r--r--src/file-manager/fm-icon-view.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 084e81bc3..971cca30c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-11-06 Alexander Larsson <alexl@redhat.com>
+ * src/file-manager/fm-icon-view.c (play_file):
+ Don't close handle and free buffer twice on error. (#321175)
+
+2006-11-06 Alexander Larsson <alexl@redhat.com>
+
* libnautilus-private/nautilus-file.c (nautilus_file_new_from_relative_uri):
Don't crash on old desktop dir and search dir uris. (#349840)
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index af40b9922..864382eb9 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -1829,8 +1829,6 @@ play_file (gpointer callback_data)
READ_CHUNK_SIZE,
&bytes_read);
if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) {
- g_free (buffer);
- gnome_vfs_close (handle);
break;
}