CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-06 11:38:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More graceful error handling if input driver fails.

Browse Source
This commit is contained in:
Themaister 2010-12-24 01:07:27 +01:00
parent a329845be5
commit 08d379ced2
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ssnes.c
View File

@ -80,6 +80,15 @@ static void write_file(const char* path, uint8_t* data, size_t size);
static void load_save_file(const char* path, int type); static void load_save_file(const char* path, int type);
static void save_file(const char* path, int type); static void save_file(const char* path, int type);
#define SSNES_LOG(msg, args...) do { \
if (verbose) \
fprintf(stderr, "SSNES: " msg, ##args); \
} while(0)
#define SSNES_ERR(msg, args...) do { \
fprintf(stderr, "SSNES [ERROR] :: " msg, ##args); \
} while(0)
// To avoid continous switching if we hold the button down, we require that the button must go from pressed, unpressed back to pressed to be able to toggle between then. // To avoid continous switching if we hold the button down, we require that the button must go from pressed, unpressed back to pressed to be able to toggle between then.
@ -184,10 +193,12 @@ static void init_video_input(void)
.input_scale = scale, .input_scale = scale,
}; };
const input_driver_t *tmp = driver.input;
driver.video_data = driver.video->init(&video, &(driver.input)); driver.video_data = driver.video->init(&video, &(driver.input));
if ( driver.video_data == NULL ) if ( driver.video_data == NULL )
{ {
SSNES_ERR("Cannot open video driver... Exiting ...\n");
exit(1); exit(1);
} }
@ -197,9 +208,18 @@ static void init_video_input(void)
} }
else else
{ {
driver.input_data = driver.input->init(); driver.input = tmp;
if ( driver.input_data == NULL ) if (driver.input != NULL)
{
driver.input_data = driver.input->init();
if ( driver.input_data == NULL )
exit(1);
}
else
{
SSNES_ERR("Cannot find input driver. Exiting ...\n");
exit(1); exit(1);
}
} }
} }
@ -359,15 +379,6 @@ static bool verbose = false;
char cg_shader_path[256] = DEFAULT_CG_SHADER; char cg_shader_path[256] = DEFAULT_CG_SHADER;
#endif #endif
#define SSNES_LOG(msg, args...) do { \
if (verbose) \
fprintf(stderr, "SSNES: " msg, ##args); \
} while(0)
#define SSNES_ERR(msg, args...) do { \
fprintf(stderr, "SSNES [ERROR] :: " msg, ##args); \
} while(0)
static void parse_input(int argc, char *argv[]) static void parse_input(int argc, char *argv[])
{ {
if (argc < 2) if (argc < 2)