From 92687652447c66f2b394a1b3d2bc874d28d45739 Mon Sep 17 00:00:00 2001
From: Nuno <ulukyn@gmail.com>
Date: Wed, 14 Jun 2023 14:39:14 +0200
Subject: [PATCH] Merge branch
 '164-crash-on-patching-and-possibly-right-after-login' into main/gingo-test

---
 azure-pipelines.yml              |  7 +++++++
 ryzom/client/src/login_patch.cpp | 16 ++++++++--------
 ryzom/client/src/user_entity.cpp |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9c735531b..e42680e06 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,3 +1,10 @@
+trigger:
+  branches:
+    include:
+      - core4
+      - feature/*
+      - main/atys-live
+
 jobs:
   - job: ubuntu18
     timeoutInMinutes: 120
diff --git a/ryzom/client/src/login_patch.cpp b/ryzom/client/src/login_patch.cpp
index 82665aac1..b97d410be 100644
--- a/ryzom/client/src/login_patch.cpp
+++ b/ryzom/client/src/login_patch.cpp
@@ -533,6 +533,8 @@ void CPatchManager::getInfoToDisp(SPatchInfo &piOut)
 	}
 }
 
+void stopSoundMngr();
+
 // ****************************************************************************
 // TODO : use selected categories to patch a list of files
 void CPatchManager::startPatchThread(const vector<string> &CategoriesSelected, bool applyPatch)
@@ -623,6 +625,12 @@ void CPatchManager::startPatchThread(const vector<string> &CategoriesSelected, b
 
 						// Close opened big files
 						CBigFile::getInstance().remove(FilesToPatch[k].FileName);
+						
+						if (NLMISC::startsWith(FilesToPatch[k].FileName, "sound"))
+						{
+							// Stop sound playback
+							stopSoundMngr();
+						}
 					}
 				}
 			}
@@ -2605,8 +2613,6 @@ public:
 	}
 };
 
-void stopSoundMngr();
-
 // ****************************************************************************
 void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 {
@@ -2618,12 +2624,6 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 	// Destination File Name (in writable directory)
 	string DestinationName;
 
-	if (NLMISC::startsWith(rFTP.FileName, "sound"))
-	{
-		// Stop sound playback
-		stopSoundMngr();
-	}
-
 	if (rFTP.ExtractPath.empty())
 	{
 		DestinationName = pPM->WritableClientDataPath + rFTP.FileName;
diff --git a/ryzom/client/src/user_entity.cpp b/ryzom/client/src/user_entity.cpp
index 0077b2bc4..9ec59f6fb 100644
--- a/ryzom/client/src/user_entity.cpp
+++ b/ryzom/client/src/user_entity.cpp
@@ -194,6 +194,7 @@ CUserEntity::CUserEntity()
 
 	_R2CharMode= R2::TCharMode::Player;
 
+	_CameraMoves = NLMISC::CVector(0, 0, 0);
 }// CUserEntity //
 
 
-- 
2.11.4.GIT