SetIniFile with NULL forces reload, MSSQL schema files create primary keys, Updater fixed

git-svn-id: svn://ultimatepp.org/upp/trunk@827 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-01-30 12:17:59 +00:00
parent b8931c0a16
commit 78e391fbb0
4 changed files with 12 additions and 6 deletions

View file

@ -362,16 +362,17 @@ VectorMap<String, String> LoadIniFile(const char *filename) {
}
const char *sIniFile;
static bool s_ini_loaded;
void SetIniFile(const char *name) {
sIniFile = name;
s_ini_loaded = false;
}
String GetIniKey(const char *name) {
static bool loaded;
static VectorMap<String, String> key;
if(!loaded) {
loaded = true;
if(!s_ini_loaded) {
s_ini_loaded = true;
key = LoadIniFile(sIniFile ? sIniFile : ~ConfigFile("q.ini"));
#ifdef PLATFORM_WIN32
if(key.GetCount() == 0)