From db2534d8a61370727b0e36057b963a49a2ea0783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96mer=20=C5=9Eiar=20Baysal?= <osiarbaysal@gmail.com>
Date: Fri, 8 Nov 2024 11:25:33 +0100
Subject: [PATCH] try to resolve conflict

---
 src/minidexed.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/minidexed.cpp b/src/minidexed.cpp
index 6c0b46f..f26c8a1 100644
--- 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);