notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix some alignment issues
[pcsx_rearmed.git]
/
frontend
/
main.c
diff --git
a/frontend/main.c
b/frontend/main.c
index
52fa349
..
cb37bd7
100644
(file)
--- a/
frontend/main.c
+++ b/
frontend/main.c
@@
-16,6
+16,7
@@
#include "main.h"
#include "plugin.h"
#include "main.h"
#include "plugin.h"
+#include "plugin_lib.h"
#include "pcnt.h"
#include "menu.h"
#include "../libpcsxcore/misc.h"
#include "pcnt.h"
#include "menu.h"
#include "../libpcsxcore/misc.h"
@@
-61,15
+62,16
@@
static void CheckSubDir() {
void set_cd_image(const char *fname)
{
void set_cd_image(const char *fname)
{
- const char *ext;
- int len;
+ const char *ext = NULL;
- len = strlen(fname);
- ext = fname;
- if (len > 2)
- ext = fname + len - 2;
+ if (fname != NULL) {
+ int len = strlen(fname);
+ ext = fname;
+ if (len > 2)
+ ext = fname + len - 2;
+ }
- if (strcasecmp(ext, ".z") == 0) {
+ if (
ext &&
strcasecmp(ext, ".z") == 0) {
SetIsoFile(NULL);
cdrcimg_set_fname(fname);
strcpy(Config.Cdr, "builtin_cdrcimg");
SetIsoFile(NULL);
cdrcimg_set_fname(fname);
strcpy(Config.Cdr, "builtin_cdrcimg");
@@
-242,6
+244,8
@@
int main(int argc, char *argv[])
else
menu_loop();
else
menu_loop();
+ pl_start_watchdog();
+
while (1)
{
psxCpu->Execute();
while (1)
{
psxCpu->Execute();