hiro/openAV-Luppp
1
0
Fork 0
mirror of https://github.com/vale981/openAV-Luppp synced 2025-03-05 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

-Improved preference loading error checking

Browse source
This commit is contained in:
Harry van Haaren 2013-12-10 13:05:27 +00:00
parent ddd44f3950
commit 5cd23266a0
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -38,7 +38,7 @@ ENDIF(BUILD_TESTS)
IF(RELEASE_BUILD) IF(RELEASE_BUILD)
SET(CMAKE_CXX_FLAGS "-g -Wall -Werror -Wno-unused-variable -ffast-math") SET(CMAKE_CXX_FLAGS "-g -Wall -Werror -Wno-unused-variable -ffast-math")
SET(CMAKE_C_FLAGS "-g -Wall -Werror -W -Wno-unused-variable -ffast-math") SET(CMAKE_C_FLAGS "-g -Wall -Werror -W -Wno-unused-variable -ffast-math")
ENDIF(RELEASE_BUILD) ENDIF(RELEASE_BUILD)

2
src/diskreader.cxx
View file

@ -66,6 +66,7 @@ int DiskReader::loadPreferences()
cJSON* preferencesJson = cJSON_Parse( sampleString ); cJSON* preferencesJson = cJSON_Parse( sampleString );
if (!preferencesJson) if (!preferencesJson)
{ {
LUPPP_WARN("Preferences JSON not valid");
return LUPPP_RETURN_ERROR; return LUPPP_RETURN_ERROR;
} }
@ -108,6 +109,7 @@ int DiskReader::loadPreferences()
else else
{ {
// empty file / file no exists: // empty file / file no exists:
LUPPP_WARN("Preferences, file doesn't exist: ~/.config/openAV/luppp/luppp.prefs");
return LUPPP_RETURN_ERROR; return LUPPP_RETURN_ERROR;
} }

2
src/gui.cxx
View file

@ -434,7 +434,7 @@ Gui::Gui(std::string argZero) :
int prefs = diskReader->loadPreferences(); int prefs = diskReader->loadPreferences();
if ( prefs != LUPPP_RETURN_OK ) if ( prefs != LUPPP_RETURN_OK )
{ {
LUPPP_ERROR("Error loading preferences"); LUPPP_WARN("No preferences loaded, using defaults.");
} }
else else
{ {