[brasero] Allow cancelling of blanking again (fix a recent change)
- From: Philippe Rouquier <philippr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [brasero] Allow cancelling of blanking again (fix a recent change)
- Date: Fri, 21 May 2010 18:16:32 +0000 (UTC)
commit e4ff3b9bf70b87e5bd8b8b2656fff4e8b732ecc6
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date: Fri May 21 21:55:23 2010 +0200
Allow cancelling of blanking again (fix a recent change)
libbrasero-burn/brasero-burn.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/libbrasero-burn/brasero-burn.c b/libbrasero-burn/brasero-burn.c
index 34861a8..6a90f59 100644
--- a/libbrasero-burn/brasero-burn.c
+++ b/libbrasero-burn/brasero-burn.c
@@ -2149,20 +2149,24 @@ brasero_burn_run_tasks (BraseroBurn *burn,
* data on it when we get to the real recording. */
if (erase_allowed) {
result = brasero_burn_run_eraser (burn, error);
+ if (result == BRASERO_BURN_CANCEL)
+ return result;
/* If the erasing process did not work then do
* not fail and cancel the entire session but
* ask the user if he wants to insert another
* disc instead. */
if (result != BRASERO_BURN_OK) {
- result = brasero_burn_emit_signal (burn,
- BLANK_FAILURE_SIGNAL,
- BRASERO_BURN_ERR);
- if (result == BRASERO_BURN_OK) {
- result = brasero_burn_reload_dest_media (burn,
- BRASERO_BURN_ERROR_NONE,
- NULL);
- if (result == BRASERO_BURN_OK)
+ BraseroBurnResult local_result;
+
+ local_result = brasero_burn_emit_signal (burn,
+ BLANK_FAILURE_SIGNAL,
+ BRASERO_BURN_ERR);
+ if (local_result == BRASERO_BURN_OK) {
+ local_result = brasero_burn_reload_dest_media (burn,
+ BRASERO_BURN_ERROR_NONE,
+ NULL);
+ if (local_result == BRASERO_BURN_OK)
result = BRASERO_BURN_RETRY;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]