From afe84395c5d15026411319f6bd582a37d01482b0 Mon Sep 17 00:00:00 2001 From: myT Date: Mon, 29 Jan 2018 20:23:17 +0100 Subject: [PATCH] fs_reordered is now always set before leaving the FS_ReorderPurePaks function --- code/qcommon/files.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp index 37e3ac3..7485be7 100644 --- a/code/qcommon/files.cpp +++ b/code/qcommon/files.cpp @@ -2551,12 +2551,12 @@ static void FS_ReorderPurePaks() searchpath_t **p_insert_index, // for linked list reordering **p_previous; // when doing the scan + fs_reordered = qfalse; + // only relevant when connected to pure server if ( !fs_numServerPaks ) return; - fs_reordered = qfalse; - p_insert_index = &fs_searchpaths; // we insert in order at the beginning of the list for ( i = 0 ; i < fs_numServerPaks ; i++ ) { p_previous = p_insert_index; // track the pointer-to-current-item @@ -3089,7 +3089,7 @@ restart if necessary void FS_ConditionalRestart( int checksumFeed ) { if( fs_gamedirvar->modified || checksumFeed != fs_checksumFeed ) { FS_Restart( checksumFeed ); - } else if ( fs_numServerPaks ) { + } else if ( fs_numServerPaks && !fs_reordered ) { FS_ReorderPurePaks(); } }