Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-31 14:13:52 +01:00
Code Issues Projects Releases Wiki Activity

Resolved conflict in ChangeLog

Browse Source
This commit is contained in:
Fred Gleason
2014-09-20 22:07:49 -04:00
parent 70db1b21d4 3dfcbe67cb
commit b5977e08a9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -14489,3 +14489,6 @@
2014-09-20 Alban Peignier <alban@tryphon.eu>
* Merged patch from albanpeignier to use global cue assignments
for RDCueEdit, Audition Hea/Tail in RDAirPlay [GitHub issue #000024].
2014-09-19 Alban Peignier <alban@tryphon.eu>
* Fixed 'web/rdxport/carts.cpp' which tried to create associated group
during cart creation

2
web/rdxport/carts.cpp
View File

@@ -73,7 +73,7 @@ void Xport::AddCart()
if(!xport_user->groupAuthorized(group_name)) {
XmlExit("No such group",404);
}
group=new RDGroup(group_name,this);
group=new RDGroup(group_name);
if(cart_number==0) {
if((cart_number=group->nextFreeCart())==0) {
delete group;