summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2004-09-04 19:55:46 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2004-09-04 19:55:46 +0000
commitea36f2bb1b8b1bf03b8615672866f93697caff75 (patch)
treebecfebab89c90c0a96b65c50e7a8a94cc40fc9fe
parenta1561f0d2d07ad7a54bf72986eb8dfae8759ca10 (diff)
Fix to bug #24, stringstream::clear() clears the stream error state not its data
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@854 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/InspIRCd.layout22
-rw-r--r--src/inspircd_io.cpp3
2 files changed, 12 insertions, 13 deletions
diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index 90089a2cb..3f8d6d90d 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -1,5 +1,5 @@
[Editors]
-Focused=1
+Focused=2
Order=2,4,6,3,7,25,5,24,39,42,43,1,46,0,49,-1
[Editor_0]
@@ -12,18 +12,18 @@ LeftChar=1
[Editor_1]
Open=1
-Top=1
-CursorCol=2
-CursorRow=339
-TopLine=300
+Top=0
+CursorCol=7
+CursorRow=3295
+TopLine=3269
LeftChar=1
[Editor_2]
Open=1
-Top=0
-CursorCol=19
+Top=1
+CursorCol=16
CursorRow=124
-TopLine=99
+TopLine=117
LeftChar=1
[Editor_3]
@@ -330,9 +330,9 @@ LeftChar=34
[Editor_43]
Open=1
Top=0
-CursorCol=14
-CursorRow=952
-TopLine=919
+CursorCol=2
+CursorRow=1194
+TopLine=1143
LeftChar=1
[Editor_44]
Open=0
diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index 405b3d046..553d73e96 100644
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -121,7 +121,7 @@ bool FileExists (const char* file)
bool LoadConf(const char* filename, std::stringstream *target)
{
- target->clear();
+ target->str("");
FILE* conf = fopen(filename,"r");
if (!FileExists(filename))
{
@@ -130,7 +130,6 @@ bool LoadConf(const char* filename, std::stringstream *target)
char buffer[MAXBUF];
if (conf)
{
- target->clear();
while (!feof(conf))
{
if (fgets(buffer, MAXBUF, conf))