summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2010-05-08 01:33:05 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2010-05-08 01:33:05 +0800
commitad7a8041762d983b295069cf6bad19aa55f0f2a7 (patch)
treeb2a96550c833fd3328b26756e9f1e8477a3db6a1
parentc4673a6f32926629d87aa31a72213e2f490e927c (diff)
downloadpttbbs-ad7a8041762d983b295069cf6bad19aa55f0f2a7.tar
pttbbs-ad7a8041762d983b295069cf6bad19aa55f0f2a7.tar.gz
pttbbs-ad7a8041762d983b295069cf6bad19aa55f0f2a7.tar.bz2
pttbbs-ad7a8041762d983b295069cf6bad19aa55f0f2a7.tar.lz
pttbbs-ad7a8041762d983b295069cf6bad19aa55f0f2a7.tar.xz
pttbbs-ad7a8041762d983b295069cf6bad19aa55f0f2a7.tar.zst
pttbbs-ad7a8041762d983b295069cf6bad19aa55f0f2a7.zip
* fix the wrong display when dymaxactive > MAX_ACTIVE
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5044 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--pttbbs/mbbsd/cal.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/pttbbs/mbbsd/cal.c b/pttbbs/mbbsd/cal.c
index b7dad5d7..ecf03bd7 100644
--- a/pttbbs/mbbsd/cal.c
+++ b/pttbbs/mbbsd/cal.c
@@ -501,7 +501,9 @@ p_sysinfo(void)
"°_©l®É¶¡: %s\n",
cpuloadstr, SHM->UTMPnumber,
#ifdef DYMAX_ACTIVE
- SHM->GV2.e.dymaxactive > 2000 ? SHM->GV2.e.dymaxactive : MAX_ACTIVE,
+ // XXX check the related logic in mbbsd.c
+ (SHM->GV2.e.dymaxactive > 2000 && SHM->GV2.e.dymaxactive < MAX_ACTIVE) ?
+ SHM->GV2.e.dymaxactive : MAX_ACTIVE,
#else
MAX_ACTIVE,
#endif