[brasero/gnome-2-30] Make sure priv->probe is NULL before the MEDIUM_PROBED_SIGNAL is fired. Otherwise a callback for the



commit 7f499b47c4e128ddf9c3f4e2fecaf98a39735436
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Mon May 24 23:19:56 2010 +0200

    Make sure priv->probe is NULL before the MEDIUM_PROBED_SIGNAL is fired.
    Otherwise a callback for the signal would get TRUE for brasero_medium_is_probing ().

 libbrasero-burn/brasero-session-cfg.c |    5 +++--
 libbrasero-media/brasero-medium.c     |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/libbrasero-burn/brasero-session-cfg.c b/libbrasero-burn/brasero-session-cfg.c
index 921045b..ebf7cc8 100644
--- a/libbrasero-burn/brasero-session-cfg.c
+++ b/libbrasero-burn/brasero-session-cfg.c
@@ -1149,8 +1149,9 @@ brasero_session_cfg_update (BraseroSessionCfg *self)
 	/* Check that current input and output work */
 	if (brasero_track_type_get_has_stream (source)) {
 		if (priv->CD_TEXT_modified) {
-			/* Try to redo what we undid (after all a new plugin could have
-			 * been activated in the mean time ...) and see what happens */
+			/* Try to redo what we undid (after all a new plugin
+			 * could have been activated in the mean time ...) and
+			 * see what happens */
 			brasero_track_type_set_stream_format (source,
 							      BRASERO_METADATA_INFO|
 							      brasero_track_type_get_stream_format (source));
diff --git a/libbrasero-media/brasero-medium.c b/libbrasero-media/brasero-medium.c
index 8fe1e88..042a0f9 100644
--- a/libbrasero-media/brasero-medium.c
+++ b/libbrasero-media/brasero-medium.c
@@ -3048,10 +3048,10 @@ end:
 
 	g_mutex_lock (priv->mutex);
 
+	priv->probe = NULL;
 	if (!priv->probe_cancelled)
 		priv->probe_id = g_idle_add (brasero_medium_probed, self);
 
-	priv->probe = NULL;
 	g_cond_broadcast (priv->cond);
 	g_mutex_unlock (priv->mutex);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]