ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: Call NDS_Init() early 

Since NDS_Init takes no arguments, it should not hurt to call it early
in the gtk frontend, too.

This fixes the segfault in issue #415, although I could not get it to
run a r4 kernel in a quick test.
This commit is contained in:
Ingo Saitz 2021-11-19 15:09:56 +01:00 committed by linkmauve
parent f827be2e0f
commit b4080b2cae
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/frontend/posix/gtk/desmume.cpp
View File

@ -32,8 +32,6 @@ BOOL click = FALSE;
void desmume_init( int disable_sound) void desmume_init( int disable_sound)
{ {
NDS_Init();
if ( !disable_sound) { if ( !disable_sound) {
SPU_ChangeSoundCore(SNDCORE_SDL, 735 * 4); SPU_ChangeSoundCore(SNDCORE_SDL, 735 * 4);
} }

2
desmume/src/frontend/posix/gtk/main.cpp
View File

@ -3599,6 +3599,8 @@ int main (int argc, char *argv[])
// The global menu screws up the window size... // The global menu screws up the window size...
unsetenv("UBUNTU_MENUPROXY"); unsetenv("UBUNTU_MENUPROXY");
// this must be called as early as possible
NDS_Init();
my_config.parse(argc, argv); my_config.parse(argc, argv);
init_configured_features( &my_config); init_configured_features( &my_config);