[brasero/gnome-2-28] Fix #602888 - The files on new directory on Brasero project isn't saved correctly.
- From: Philippe Rouquier <philippr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [brasero/gnome-2-28] Fix #602888 - The files on new directory on Brasero project isn't saved correctly.
- Date: Mon, 14 Dec 2009 16:57:34 +0000 (UTC)
commit e714cd0edcca49419256ed4b3610a995d664058f
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date: Sun Dec 6 21:17:47 2009 +0100
Fix #602888 - The files on new directory on Brasero project isn't saved correctly.
This should be backported to 2.28
libbrasero-burn/brasero-data-project.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/libbrasero-burn/brasero-data-project.c b/libbrasero-burn/brasero-data-project.c
index 070efd0..5084ad9 100644
--- a/libbrasero-burn/brasero-data-project.c
+++ b/libbrasero-burn/brasero-data-project.c
@@ -3515,7 +3515,7 @@ brasero_data_project_load_contents_notify_directory (BraseroDataProject *self,
/* The child could be removed during the process */
next = child->next;
-
+
/**
* This is to get the number of operations remaining before the
* whole project is loaded.
@@ -3526,20 +3526,21 @@ brasero_data_project_load_contents_notify_directory (BraseroDataProject *self,
if (child->is_fake) {
/* This is a fake directory, there is no operation */
res = func (self, child, NULL);
- child = next;
- continue;
}
+ else {
+ uri = brasero_data_project_node_to_uri (self, child);
+ res = func (self, child, uri);
+ g_free (uri);
- uri = brasero_data_project_node_to_uri (self, child);
- res = func (self, child, uri);
- g_free (uri);
-
- if (res)
- num ++;
+ if (res)
+ num ++;
+ }
/* for whatever reason the node could have been invalidated */
if (res && !child->is_file) {
- num ++;
+ if (!child->is_fake)
+ num ++;
+
num += brasero_data_project_load_contents_notify_directory (self,
child,
func);
@@ -3619,7 +3620,6 @@ brasero_data_project_load_contents (BraseroDataProject *self,
path,
uri,
folders);
-
g_free (path);
g_free (uri);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]