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

2018-01-10 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed bugs in rdlogmanager(1) that caused segfaults under
	Windows.
This commit is contained in:
Fred Gleason 2018-01-10 11:48:40 -05:00
parent 43ca6e30cc
commit bd532a409d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -16580,3 +16580,6 @@
data to a log to remove voice track transitions. data to a log to remove voice track transitions.
2018-01-10 Fred Gleason <fredg@paravelsystems.com> 2018-01-10 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up compiler warnings. * Cleaned up compiler warnings.
2018-01-10 Fred Gleason <fredg@paravelsystems.com>
* Fixed bugs in rdlogmanager(1) that caused segfaults under
Windows.

9
lib/rdloglock.cpp
View File

@ -61,11 +61,20 @@ bool RDLogLock::tryLock(QString *username,QString *stationname,
QHostAddress *addr) QHostAddress *addr)
{ {
bool ret=false; bool ret=false;
#ifdef WIN32
QString guid=RDLogLock::makeGuid("windows");
#else
QString guid=RDLogLock::makeGuid(lock_station->name()); QString guid=RDLogLock::makeGuid(lock_station->name());
#endif // WIN32
#ifdef WIN32
*username="windows";
*stationname="windows";
#else
*username=lock_user->name(); *username=lock_user->name();
*stationname=lock_station->name(); *stationname=lock_station->name();
addr->setAddress(lock_station->address().toString()); addr->setAddress(lock_station->address().toString());
#endif // WIN32
if(RDLogLock::tryLock(username,stationname,addr,lock_log_name,guid)) { if(RDLogLock::tryLock(username,stationname,addr,lock_log_name,guid)) {
lock_timer->start(RD_LOG_LOCK_TIMEOUT/2); lock_timer->start(RD_LOG_LOCK_TIMEOUT/2);