try to resolve conflict

probonopd · Nov 8, 2024 · db2534d · db2534d
1 parent dc2a8b4
commit db2534d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/minidexed.cpp b/src/minidexed.cpp
@@ -55,16 +55,16 @@ CMiniDexed::CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt,
 	m_GetChunkTimer ("GetChunk",
 			 1000000U * pConfig->GetChunkSize ()/2 / pConfig->GetSampleRate ()),
 	m_bProfileEnabled (m_pConfig->GetProfileEnabled ()),
-	m_bSavePerformance (false),
-	m_bSavePerformanceNewFile (false),
-	m_bSetNewPerformance (false),
-	m_bDeletePerformance (false),
 	m_pNet(nullptr),
 	m_pNetDevice(nullptr),
 	m_WLAN(WLANFirmwarePath),
 	m_WPASupplicant(WLANConfigFile),
 	m_bNetworkReady(false),
 	m_UDPMIDI (this, pConfig, &m_UI),
+	m_bSavePerformance (false),
+	m_bSavePerformanceNewFile (false),
+	m_bSetNewPerformance (false),
+	m_bDeletePerformance (false),
 	m_bLoadPerformanceBusy(false)
 {
 	assert (m_pConfig);