Changeset 9111898 in nscp for include/settings

Timestamp:

08/22/10 09:51:17 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

57a86f3

Parents:

2a1411e

Message:

Various settings loading fixes

Location:

include/settings

Files:

• settings_ini.hpp (modified) (1 diff)
• settings_interface_impl.hpp (modified) (1 diff)

include/settings/settings_ini.hpp

@@ -225 +225 @@
         return;
       }
-      SI_Error rc = ini.LoadFile(get_file_name().string().c_str());
+      std::wstring f = get_file_name().string();
+      get_core()->get_logger()->debug(__FILEW__, __LINE__, _T("Loading: ") + f);
+      SI_Error rc = ini.LoadFile(f.c_str());
       if (rc < 0)
         throw_SI_error(rc, _T("Failed to load file"));

include/settings/settings_interface_impl.hpp

@@ -492 +492 @@
     }
     virtual std::wstring get_file_from_context() {
-      return core_->find_file(url_.host + url_.path, DEFAULT_CONF_OLD_LOCATION);
+      return core_->find_file(url_.host + url_.path, _T(""));
     }
     //////////////////////////////////////////////////////////////////////////