Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-16 17:41:16 +01:00
Code Issues Projects Releases Wiki Activity

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason
2020-04-08 18:33:04 -04:00
parent 0ae0b38840 d7253e31c1
commit 48d29d9c75
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -19749,7 +19749,6 @@
* Fixed a regression in rdairplay(1) that caused two events to be * Fixed a regression in rdairplay(1) that caused two events to be
started by a single spacebar tap if a SoundPanel event had been started by a single spacebar tap if a SoundPanel event had been
played previously. played previously.
<<<<<<< HEAD
2020-04-08 Fred Gleason <fredg@paravelsystems.com> 2020-04-08 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlogmanager(1) that caused the initial event * Fixed a bug in rdlogmanager(1) that caused the initial event
in an imported set to fail receive the proper time and transition in an imported set to fail receive the proper time and transition
@@ -19764,3 +19763,6 @@
2020-04-08 Patrick Linstruth <patrick@deltecent.com> 2020-04-08 Patrick Linstruth <patrick@deltecent.com>
* Fixed a bug in rdairplay(1) with HourSelector::updateTimeData() * Fixed a bug in rdairplay(1) with HourSelector::updateTimeData()
where timer was not set properly when crossing midnight. where timer was not set properly when crossing midnight.
2020-04-08 Patrick Linstruth <patrick@deltecent.com>
* Modified rdairplay(1) to always scroll log to the top when using
the hour selector.

2
rdairplay/list_log.cpp
View File

@@ -586,6 +586,8 @@ void ListLog::selectHour(int hour)
while(item!=NULL) { while(item!=NULL) {
if(PredictedStartHour(item)==hour) { if(PredictedStartHour(item)==hour) {
list_log_list->clearSelection(); list_log_list->clearSelection();
// Always start from the bottom so visible item is at the top
list_log_list->ensureItemVisible(list_log_list->lastItem());
list_log_list->ensureItemVisible(item); list_log_list->ensureItemVisible(item);
list_log_list->setSelected(item,true); list_log_list->setSelected(item,true);
return; return;