[brasero/gnome-2-28] Fix a minor wrong count of invalid files
- From: Philippe Rouquier <philippr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [brasero/gnome-2-28] Fix a minor wrong count of invalid files
- Date: Mon, 14 Dec 2009 16:57:09 +0000 (UTC)
commit 691abf532fe1505bbd670fd6467bfedcfdb2943d
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date: Wed Dec 2 14:09:25 2009 +0100
Fix a minor wrong count of invalid files
It should be backported to 2.28
libbrasero-utils/brasero-io.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/libbrasero-utils/brasero-io.c b/libbrasero-utils/brasero-io.c
index 7c18dbc..d7de0a4 100644
--- a/libbrasero-utils/brasero-io.c
+++ b/libbrasero-utils/brasero-io.c
@@ -1618,8 +1618,8 @@ brasero_io_get_file_count_process_file (BraseroIO *self,
if (!brasero_io_get_file_count_process_playlist (self, cancel, data, child_uri))
data->files_invalid ++;
}
-
- data->files_invalid ++;
+ else
+ data->files_invalid ++;
}
#endif
@@ -1725,8 +1725,8 @@ brasero_io_get_file_count_start (BraseroIO *self,
(data->job.options & BRASERO_IO_INFO_FOLLOW_SYMLINK)?G_FILE_QUERY_INFO_NONE:G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, /* follow symlinks by default*/
cancel,
NULL);
-
data->files_num ++;
+
if (!info) {
g_object_unref (file);
data->files_invalid ++;
@@ -1776,7 +1776,8 @@ brasero_io_get_file_count_thread (BraseroAsyncTaskManager *manager,
brasero_io_get_file_count_process_directory (BRASERO_IO (manager), cancel, data);
return BRASERO_ASYNC_TASK_RESCHEDULE;
}
- else if (!data->uris) {
+
+ if (!data->uris) {
info = g_file_info_new ();
/* set GFileInfo information */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]