Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 00:53:53 +02:00
Code Issues Projects Releases Wiki Activity

2018-07-31 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored 'RDMacro' to handle UTF-8 strings correctly.
This commit is contained in:
Fred Gleason
2018-07-31 12:54:08 -04:00
parent dbb0d9c415
commit 26c29e1d4e
47 changed files with 676 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ripcd/vguest.cpp
View File

@@ -368,8 +368,8 @@ void VGuest::processCommand(RDMacro *cmd)
break;
case RDMacro::GO:
if(((cmd->arg(1).toString().lower()!="i")&&
(cmd->arg(1).toString().lower()!="o"))||
if(((cmd->arg(1).lower()!="i")&&
(cmd->arg(1).lower()!="o"))||
(cmd->arg(2).toInt()<1)||(cmd->arg(2).toInt()>vguest_gpos)||
(cmd->arg(3).toInt()<0)||(cmd->arg(3).toInt()>1)||
(cmd->arg(4).toInt()<0)) {
@@ -827,7 +827,6 @@ void VGuest::ExecuteMacroCart(unsigned cartnum)
rml.setCommand(RDMacro::EX);
rml.setAddress(rda->station()->address());
rml.setEchoRequested(false);
rml.setArgQuantity(1);
rml.setArg(0,cartnum);
rml.addArg(cartnum);
emit rmlEcho(&rml);
}