From 8381ad73ecc10dd1719c88b005cb668e0d61c033 Mon Sep 17 00:00:00 2001 From: "fix94.1" Date: Thu, 7 Jun 2012 16:02:23 +0000 Subject: [PATCH] Overjoy, you are right, but that shouldn't happen, it also worked before, strange, OH yeah and -fixed two possible bugs --- source/main.cpp | 6 +++--- source/memory/mem2.cpp | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/source/main.cpp b/source/main.cpp index ede579fc..dd1a3c2b 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -41,12 +41,12 @@ int main(int argc, char **argv) CVideo vid; vid.init(); - geckoinit = InitGecko(); - gprintf(" \nWelcome to %s (%s-r%s)!\nThis is the debug output.\n", APP_NAME, APP_VERSION, SVN_REV); - MEM2_init(49); //Thats everything we can get anyways vid.waitMessage(0.2f); + geckoinit = InitGecko(); + gprintf(" \nWelcome to %s (%s-r%s)!\nThis is the debug output.\n", APP_NAME, APP_VERSION, SVN_REV); + char *gameid = NULL; bool Emulator_boot = false; diff --git a/source/memory/mem2.cpp b/source/memory/mem2.cpp index 1a8f0e31..f73f6c9d 100644 --- a/source/memory/mem2.cpp +++ b/source/memory/mem2.cpp @@ -40,11 +40,7 @@ void *MEM1_realloc(void *p, unsigned int s) void MEM1_free(void *p) { - if(p != NULL) - { - free(p); - p = NULL; - } + __real_free(p); } unsigned int MEM1_freesize()