Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 05:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

avoid warning messages on Explorer startup when missing configuration files

Browse source 
svn path=/trunk/; revision=45011
This commit is contained in:
Martin Fuchs 2010-01-08 21:51:43 +00:00
parent 8d89e2b027
commit 34689ba8c7
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/base/shell/explorer/explorer.cpp
View file

@ -94,9 +94,9 @@ void ExplorerGlobals::read_persistent()
_cfg_path.printf(TEXT("%s\\ros-explorer-cfg.xml"), _cfg_dir.c_str()); _cfg_path.printf(TEXT("%s\\ros-explorer-cfg.xml"), _cfg_dir.c_str());
if (!_cfg.read_file(_cfg_path)) { if (!_cfg.read_file(_cfg_path)) {
//if (_cfg._last_error != XML_ERROR_NO_ELEMENTS) if (!_cfg._errors.empty())
MessageBox(_hwndDesktop, _cfg._errors.str(), MessageBox(_hwndDesktop, _cfg._errors.str(),
TEXT("ROS Explorer - reading user settings"), MB_OK); TEXT("ROS Explorer - reading user settings"), MB_OK);
_cfg.read_file(TEXT("explorer-cfg-template.xml")); _cfg.read_file(TEXT("explorer-cfg-template.xml"));
} }

5
reactos/base/shell/explorer/taskbar/favorites.cpp
View file

@ -427,8 +427,9 @@ bool Favorites::read(LPCTSTR path)
XMLDoc xbel; XMLDoc xbel;
if (!xbel.read_file(path)) { if (!xbel.read_file(path)) {
MessageBox(g_Globals._hwndDesktop, xbel._errors.str(), if (!xbel._errors.empty())
TEXT("ROS Explorer - reading bookmark file"), MB_OK); MessageBox(g_Globals._hwndDesktop, xbel._errors.str(),
TEXT("ROS Explorer - reading bookmark file"), MB_OK);
} }
const_XMLPos pos(&xbel); const_XMLPos pos(&xbel);