Slight refinement to main_entry_decide
This commit is contained in:
parent
0a2e7afe27
commit
90a32b022d
|
@ -55,26 +55,23 @@
|
||||||
*
|
*
|
||||||
* Runs RetroArch for one frame.
|
* Runs RetroArch for one frame.
|
||||||
*
|
*
|
||||||
* Returns: -1 upon exiting, 0 if we want to
|
* Returns: 0 on success, -1 upon exiting.
|
||||||
* iterate to the next frame.
|
|
||||||
**/
|
**/
|
||||||
int main_entry_decide(signature(), args_type() args)
|
int main_entry_decide(signature(), args_type() args)
|
||||||
{
|
{
|
||||||
int ret = rarch_main_iterate();
|
if (rarch_main_iterate() == 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
if (ret == -1)
|
if (g_extern.core_shutdown_initiated
|
||||||
|
&& g_settings.load_dummy_on_core_shutdown)
|
||||||
{
|
{
|
||||||
if (g_extern.core_shutdown_initiated
|
/* Load dummy core instead of exiting RetroArch completely. */
|
||||||
&& g_settings.load_dummy_on_core_shutdown)
|
rarch_main_command(RARCH_CMD_PREPARE_DUMMY);
|
||||||
{
|
g_extern.core_shutdown_initiated = false;
|
||||||
/* Load dummy core instead of exiting RetroArch completely. */
|
return 0;
|
||||||
rarch_main_command(RARCH_CMD_PREPARE_DUMMY);
|
|
||||||
g_extern.core_shutdown_initiated = false;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -80,8 +80,7 @@ bool main_load_content(int argc, char **argv,
|
||||||
*
|
*
|
||||||
* Runs RetroArch for one frame.
|
* Runs RetroArch for one frame.
|
||||||
*
|
*
|
||||||
* Returns: -1 upon exiting, 0 if we want to
|
* Returns: 0 on success, -1 upon exiting.
|
||||||
* iterate to the next frame.
|
|
||||||
**/
|
**/
|
||||||
int main_entry_decide(signature(), args_type() args);
|
int main_entry_decide(signature(), args_type() args);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue