Merge tag 'v0.19.20'

release v0.19.20
This commit is contained in:
Max Kellermann
2016-12-09 20:18:54 +01:00
4 changed files with 18 additions and 5 deletions

View File

@@ -45,7 +45,7 @@ static constexpr Domain log_domain("log");
#ifndef ANDROID
static int out_fd;
static int out_fd = -1;
static AllocatedPath out_path = AllocatedPath::Null();
static void redirect_logs(int fd)

View File

@@ -427,14 +427,15 @@ Queue::SetPriority(unsigned position, uint8_t priority, int after_order,
if (_order < (unsigned)after_order) {
/* the specified song has been played already
- enqueue it only if its priority has just
become bigger than the current one's */
- enqueue it only if its priority has been
increased and is now bigger than the
current one's */
const unsigned after_position =
OrderToPosition(after_order);
const Item *after_item =
&items[after_position];
if (old_priority > after_item->priority ||
if (priority <= old_priority ||
priority <= after_item->priority)
/* priority hasn't become bigger */
return true;