[sound-juicer/wip/hadess/fix-assert] main: Fix assertion when opening prefs dialogue
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [sound-juicer/wip/hadess/fix-assert] main: Fix assertion when opening prefs dialogue
- Date: Tue, 8 Sep 2020 09:39:09 +0000 (UTC)
commit 66923d5d4ba4a42c924a2c0f343ccf7a7b1b736a
Author: Bastien Nocera <hadess hadess net>
Date: Tue Sep 8 11:38:29 2020 +0200
main: Fix assertion when opening prefs dialogue
** (sound-juicer:20): WARNING **: 11:31:52.193: (../src/sj-prefs.c:299):device_changed_cb: code should
not be reached
src/sj-prefs.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/sj-prefs.c b/src/sj-prefs.c
index 50ae57be..a8ce37f8 100644
--- a/src/sj-prefs.c
+++ b/src/sj-prefs.c
@@ -285,20 +285,21 @@ static void device_changed_cb (GSettings *settings, const gchar *key, gpointer u
g_return_if_fail (strcmp (key, SJ_SETTINGS_DEVICE) == 0);
+ monitor = brasero_medium_monitor_get_default ();
value = g_settings_get_string (settings, key);
if ((value != NULL) && (*value != '\0')) {
- monitor = brasero_medium_monitor_get_default ();
drive = brasero_medium_monitor_get_drive (monitor, value);
brasero_drive_selection_set_active (BRASERO_DRIVE_SELECTION (cd_option), drive);
g_object_unref (drive);
- g_object_unref (monitor);
} else {
- /* FIXME: see the FIXME in sj-main.c around one of the
- * device_changed_cb calls for a way to fix this
- */
- g_warn_if_reached();
+ GSList *drives;
+ drives = brasero_medium_monitor_get_drives (monitor, BRASERO_DRIVE_TYPE_ALL_BUT_FILE);
+ if (drives != NULL)
+ brasero_drive_selection_set_active (BRASERO_DRIVE_SELECTION (cd_option), drives->data);
+ g_slist_free_full (drives, (GDestroyNotify) g_object_unref);
}
g_free (value);
+ g_object_unref (monitor);
}
static void prefs_drive_changed (BraseroDriveSelection *selection, BraseroDrive *drive, gpointer user_data)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]