summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2009-10-28 14:34:23 -0700
committerPixel <pixel@nobis-crew.org>2009-10-28 14:34:23 -0700
commitc04d2f748cf851642d1b8c54a93522e7d42d204e (patch)
treea46fee5765be47a03dbf612a88a9ad71a880ef7c
parentd3e008a0d913936fee19a79df9924c1e6d7a5bc6 (diff)
parent7e482e5f40f898691df76e796a8b5630828e8316 (diff)
Merge branch 'master' of ssh+git://pixel@git.grumpycoder.net/pub/repo.git/PSX-Bundle
-rw-r--r--lib/cdutils.cpp2
-rw-r--r--lib/luacd.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/cdutils.cpp b/lib/cdutils.cpp
index e24814e..673ec8d 100644
--- a/lib/cdutils.cpp
+++ b/lib/cdutils.cpp
@@ -530,7 +530,7 @@ struct cdutils::DirEntry cdutils::find_dir_entry(struct DirEntry * dir, const St
if (!dir->R) {
ptr++;
} else {
- if (!strncmp(name.to_charp(), (char *) &(dir->id), dir->N)) {
+ if ((dir->N == name.strlen()) && (!strncmp(name.to_charp(), (char *) &(dir->id), dir->N))) {
r = *dir;
}
ptr += dir->R;
diff --git a/lib/luacd.cpp b/lib/luacd.cpp
index 9c4e55a..97dbbaf 100644
--- a/lib/luacd.cpp
+++ b/lib/luacd.cpp
@@ -207,7 +207,7 @@ void Luacdutils::pushstatics(Lua * L) throw (GeneralException) {
L->push((lua_Number) MODE2_FORM2);
L->setvar();
- L->push("MORE_RAW");
+ L->push("MODE_RAW");
L->push((lua_Number) MODE_RAW);
L->setvar();