Merge branch 'save_ext' into tracerestrict-sx

Conflicts:
	src/pathfinder/yapf/yapf_costrail.hpp

src/saveload/saveload.cpp

@@ -2469,8 +2469,6 @@ static inline void ClearSaveLoadState()
 
 	delete _sl.lf;
 	_sl.lf = NULL;
-
-	SlXvSetCurrentState();
 }
 
 /**
@@ -2782,6 +2780,8 @@ static SaveOrLoadResult DoLoad(LoadFilter *reader, bool load_check)
 		GamelogStopAction();
 	}
 
+	SlXvSetCurrentState();
+
 	return SL_OK;
 }
 
@@ -2841,6 +2841,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb, boo
 				return SL_REINIT;
 			}
 			GamelogStopAction();
+			SlXvSetCurrentState();
 			return SL_OK;
 		}