From d07b7e68acc4dffa3c4e521232d99b48a32904b2 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Thu, 19 May 2016 07:28:50 -0400 Subject: [PATCH] core/tempq: Don't enable all queues by default Enabling all queues by default, even ones read from disk, is incorrect as it leads to all queues getting reenabled when restarting Ocarina. Fixes #56: Enabled status of temporary queues not saving Signed-off-by: Anna Schumaker --- CHANGELOG | 5 +++++ core/tempq.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 606de5a5..9963184a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +6.4.12-rc: +- Don't reenable tempqueues when restarting +- Update tooltips on various buttons +- Replace pause-after GtkSpinButton with a GtkComboBoxText + 6.4.12: - Control automatic pausing with a GtkComboBox - Move current position slider into the top section diff --git a/core/tempq.c b/core/tempq.c index c1a4e031..504f6b6c 100644 --- a/core/tempq.c +++ b/core/tempq.c @@ -15,7 +15,7 @@ static struct queue *__tempq_alloc(struct queue_ops *ops, unsigned int flags) struct queue *queue = g_malloc(sizeof(struct queue)); tempq_list = g_slist_append(tempq_list, queue); - queue_init(queue, flags | Q_ENABLED | Q_SAVE_FLAGS | Q_SAVE_SORT, ops); + queue_init(queue, flags | Q_SAVE_FLAGS | Q_SAVE_SORT, ops); return queue; } @@ -93,7 +93,7 @@ void tempq_save(struct queue *queue, enum queue_flags flag) struct queue *tempq_alloc(struct queue_ops *ops, unsigned int flags) { - struct queue *queue = __tempq_alloc(ops, flags); + struct queue *queue = __tempq_alloc(ops, Q_ENABLED | flags); tempq_save(queue, Q_ENABLED); return queue; }