Mercurial > audlegacy-plugins
changeset 312:b223e71e7024 trunk
[svn] Allow modyfing configuration before loading Paranormal, without crashing.
author | jerome |
---|---|
date | Sun, 26 Nov 2006 19:47:44 -0800 |
parents | 4ddab3548cd0 |
children | 19efbc50055f |
files | ChangeLog src/paranormal/plugin.c |
diffstat | 2 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Nov 26 11:45:22 2006 -0800 +++ b/ChangeLog Sun Nov 26 19:47:44 2006 -0800 @@ -1,3 +1,11 @@ +2006-11-26 19:45:22 +0000 William Pitcock <nenolod@nenolod.net> + revision [678] + - fix debian BTFS on arm + + trunk/src/console/Nsfe_Emu.cxx | 1 - + 1 file changed, 1 deletion(-) + + 2006-11-26 08:50:00 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> revision [676] - get_song_info() in some plugins, typically wav, would crash with NULL argument.
--- a/src/paranormal/plugin.c Sun Nov 26 11:45:22 2006 -0800 +++ b/src/paranormal/plugin.c Sun Nov 26 19:47:44 2006 -0800 @@ -199,7 +199,8 @@ pn_xmms_init (void) { /* If it isn't already loaded, load the run control */ - load_pn_rc (); + if (! pn_rc) + load_pn_rc (); sound_data_mutex = SDL_CreateMutex (); config_mutex = SDL_CreateMutex (); @@ -293,6 +294,9 @@ if (config_mutex) SDL_mutexP (config_mutex); + if (! pn_rc) + load_pn_rc (); + pn_configure (); if (config_mutex) @@ -325,6 +329,9 @@ if (config_mutex) SDL_mutexP (config_mutex); + if (! pn_rc) + load_pn_rc (); + if (pn_rc->actuator) destroy_actuator (pn_rc->actuator); pn_rc->actuator = new_rc->actuator;