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

Merge pull request #19 from tryphon/rdconf-conf-temp-directory-empty

Browse Source 
Empty QString instead of NULL for RdConfig->tempDirectory()

Indeed -- in certain contexts --i.e. casting to 'const char *' -- a NULL ends up evaluating to a "(null)" string, while QString::isEmpty() will also handle the NULL case.

Merged -- thanks!
This commit is contained in:
Fred Gleason 2014-09-20 11:59:26 -04:00
commit d322f4fa2f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rdconf.cpp
View File

@ -969,7 +969,7 @@ QString RDHomeDir()
QString RDTempDir() QString RDTempDir()
{ {
QString conf_temp_directory = RDConfiguration()->tempDirectory(); QString conf_temp_directory = RDConfiguration()->tempDirectory();
if (conf_temp_directory != NULL) { if (!conf_temp_directory.isEmpty()) {
return conf_temp_directory; return conf_temp_directory;
} }
#ifdef WIN32 #ifdef WIN32

4
lib/rdconfig.cpp
View File

@ -490,7 +490,7 @@ void RDConfig::load()
conf_enable_mixer_logging=profile->boolValue("Caed","EnableMixerLogging"); conf_enable_mixer_logging=profile->boolValue("Caed","EnableMixerLogging");
conf_use_realtime=profile->boolValue("Tuning","UseRealtime",false); conf_use_realtime=profile->boolValue("Tuning","UseRealtime",false);
conf_realtime_priority=profile->intValue("Tuning","RealtimePriority",9); conf_realtime_priority=profile->intValue("Tuning","RealtimePriority",9);
conf_temp_directory=profile->stringValue("Tuning","TempDirectory",NULL); conf_temp_directory=profile->stringValue("Tuning","TempDirectory","");
conf_sas_station=profile->stringValue("SASFilter","Station",""); conf_sas_station=profile->stringValue("SASFilter","Station","");
conf_sas_matrix=profile->intValue("SASFilter","Matrix",0); conf_sas_matrix=profile->intValue("SASFilter","Matrix",0);
conf_sas_base_cart=profile->intValue("SASFilter","BaseCart",0); conf_sas_base_cart=profile->intValue("SASFilter","BaseCart",0);
@ -560,7 +560,7 @@ void RDConfig::clear()
conf_enable_mixer_logging=false; conf_enable_mixer_logging=false;
conf_use_realtime=false; conf_use_realtime=false;
conf_realtime_priority=9; conf_realtime_priority=9;
conf_temp_directory=NULL; conf_temp_directory="";
conf_sas_station=""; conf_sas_station="";
conf_sas_matrix=-1; conf_sas_matrix=-1;
conf_sas_base_cart=1; conf_sas_base_cart=1;