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

git-svn-id: svn://ultimatepp.org/upp/trunk@524 f0d560ea-af0d-0410-9eb7-867de7ffcac7

Browse source
This commit is contained in:
cxl 2008-10-13 06:29:00 +00:00
parent ddc460cb8a
commit 8c46fd4491
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/Core/Stream.cpp
View file

@ -1524,7 +1524,9 @@ String ReadStdIn()
String r;
for(;;) {
int c = getchar();
if(c < 0 || c == '\n')
if(c < 0)
return r.GetCount() ? r : String::GetVoid();
if(c == '\n')
return r;
r.Cat(c);
}

2
uppsrc/ide/AutoSetup.cpp
View file

@ -102,7 +102,7 @@ void AutoSetup()
dlg.mysql <<= NormalizePathNN(GetWinRegString("Location", "SOFTWARE\\MySQL AB\\MySQL Server 4.1"));
String sdl = NormalizePathNN(ConfigFile("SDL-1.2.9"));
String sdl = NormalizePathNN(ConfigFile("sdl"));
if(DirectoryExists(sdl))
dlg.sdl <<= sdl;