github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: GetIniKey fix

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1724 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-11-26 16:43:08 +00:00
parent f46e73d5aa
commit bb4160c8cf
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Util.cpp
View file

@ -387,7 +387,7 @@ String GetIniKey(const char *id, const String& def) {
static VectorMap<String, String> key;
if(!s_ini_loaded) {
s_ini_loaded = true;
key = LoadIniFile(sIniFile ? sIniFile : ~ConfigFile("q.ini"));
key = LoadIniFile(*sIniFile ? sIniFile : ~ConfigFile("q.ini"));
#ifdef PLATFORM_WIN32
if(key.GetCount() == 0)
key = LoadIniFile("C:\\Q.INI");

26
uppsrc/CtrlLib/Update.cpp
View file

@ -114,19 +114,21 @@ void SelfUpdate() {
char dst[512];
UpdateFile("UPDATER.EXE");
::GetModuleFileName(NULL, dst, 512);
String src = GetIniKey("UPDATE");
if(src.IsEmpty()) return;
src = AppendFileName(src, GetFileNamePos(dst));
int dummy;
if(NoUpdate(dst, src, dummy)) return;
String commandline;
const Vector<String>& cmd = CommandLine();
for(int i = 0; i < cmd.GetCount(); i++) {
commandline += ' ';
commandline += FixArg(cmd[i]);
{
String src = GetIniKey("UPDATE");
if(src.IsEmpty()) return;
src = AppendFileName(src, GetFileNamePos(dst));
int dummy;
if(NoUpdate(dst, src, dummy)) return;
String commandline;
const Vector<String>& cmd = CommandLine();
for(int i = 0; i < cmd.GetCount(); i++) {
commandline += ' ';
commandline += FixArg(cmd[i]);
}
if(WinExec(GetExeDirFile("updater.exe") + " " + GetFileName(dst) + commandline, SW_SHOWNORMAL) <= 31)
return;
}
if(WinExec(GetExeDirFile("updater.exe") + " " + GetFileName(dst) + commandline, SW_SHOWNORMAL) <= 31)
return;
exit(0);
}