Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff
This commit is contained in:
commit
d41f4810d7
2 files changed
+2
-2
No files matched your search
+1
-1
@@ -71,7 +71,7 @@ apng_create_info_struct (png_structp pngp)
|
||||
{
|
||||
apng_infop ainfop;
|
||||
(void)pngp;
|
||||
if (( ainfop = calloc(sizeof (apng_info),1) ))
|
||||
if (( ainfop = calloc(1, sizeof (apng_info)) ))
|
||||
{
|
||||
apng_set_write_fn(pngp, ainfop, 0, 0, 0, 0, 0);
|
||||
apng_set_set_acTL_fn(pngp, ainfop, 0);
|
||||
|
||||
+1
-1
@@ -383,7 +383,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
|
||||
I_OsPolling();
|
||||
I_UpdateNoBlit();
|
||||
|
||||
if (drawMenu)
|
||||
if (rendermode != render_none && drawMenu)
|
||||
{
|
||||
#ifdef HAVE_THREADS
|
||||
I_lock_mutex(&m_menu_mutex);
|
||||
|
||||
Reference in new issue
Block a user