Fixed crash when writing odf and rank tried to access NULL windchest. Fixed reading odf with only pedal. Made sure CMake would consider changes to version.txt. [skip ci]

Author: larspalo

CHANGELOG.md

@@ -11,6 +11,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Option to create new panel from selection on existing panel display.
 
+## [0.11.1] - 2024-04-22
+
+### Changed
+
+- CMake build system now take changes to version.txt file into account.
+
+### Fixed
+
+- Crash when writing .organ file and a rank tried to access non existant windchest.
+- Loading of an .organ file with only a pedal as manual.
+
 ## [0.11.0] - 2024-03-30
 
 ### Added

CMakeLists.txt

@@ -16,7 +16,10 @@
 
 cmake_minimum_required(VERSION 3.10)
 
-# read PROGRAM_VERSION from file
+# Make sure that the version file will be considered by CMake
+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/version.txt")
+
+# Read PROGRAM_VERSION from file
 if(EXISTS "${CMAKE_SOURCE_DIR}/version.txt")
   file(READ "${CMAKE_SOURCE_DIR}/version.txt" PROGRAM_VERSION)
   string(STRIP "${PROGRAM_VERSION}" PROGRAM_VERSION)

src/OrganFileParser.cpp

@@ -330,7 +330,7 @@ void OrganFileParser::parseOrganSection() {
 	// needs to be parsed after all manuals have been added to the organ
 	// and then the divisionals need to be added after the couplers
 	int nbrManuals = static_cast<int>(m_organFile->ReadLong("NumberOfManuals", 0));
-	if (nbrManuals > 0 && nbrManuals < 17) {
+	if ((nbrManuals > 0 && nbrManuals < 17) || (nbrManuals == 0 && m_organ->doesHavePedals())) {
 		if (m_organ->doesHavePedals())
 			nbrManuals += 1;
 		for (int i = 0; i < nbrManuals; i++) {

src/Rank.cpp

@@ -88,20 +88,22 @@ void Rank::write(wxTextFile *outFile) {
 		outFile->AddLine(wxT("HarmonicNumber=") + wxString::Format(wxT("%i"), harmonicNumber));
 	if (pitchCorrection != 0)
 		outFile->AddLine(wxT("PitchCorrection=") + wxString::Format(wxT("%f"), pitchCorrection));
-	wxString wcRef = GOODF_functions::number_format(::wxGetApp().m_frame->m_organ->getIndexOfOrganWindchest(windchest));
-	outFile->AddLine(wxT("WindchestGroup=") + wcRef);
-	if (percussive != windchest->getIsPercussive()) {
-		if (percussive) {
-			outFile->AddLine(wxT("Percussive=Y"));
-			if (hasIndependentRelease != windchest->getHasIndependentRelease()) {
-				if (hasIndependentRelease) {
-					outFile->AddLine(wxT("HasIndependentRelease=Y"));
-				} else {
-					outFile->AddLine(wxT("HasIndependentRelease=N"));
+	if (windchest) {
+		wxString wcRef = GOODF_functions::number_format(::wxGetApp().m_frame->m_organ->getIndexOfOrganWindchest(windchest));
+		outFile->AddLine(wxT("WindchestGroup=") + wcRef);
+		if (percussive != windchest->getIsPercussive()) {
+			if (percussive) {
+				outFile->AddLine(wxT("Percussive=Y"));
+				if (hasIndependentRelease != windchest->getHasIndependentRelease()) {
+					if (hasIndependentRelease) {
+						outFile->AddLine(wxT("HasIndependentRelease=Y"));
+					} else {
+						outFile->AddLine(wxT("HasIndependentRelease=N"));
+					}
 				}
+			} else {
+				outFile->AddLine(wxT("Percussive=N"));
 			}
-		} else {
-			outFile->AddLine(wxT("Percussive=N"));
 		}
 	}
 	if (minVelocityVolume != 100)
@@ -135,16 +137,18 @@ void Rank::writeFromStop(wxTextFile *outFile) {
 		outFile->AddLine(wxT("HarmonicNumber=") + wxString::Format(wxT("%i"), harmonicNumber));
 	if (pitchCorrection != 0)
 		outFile->AddLine(wxT("PitchCorrection=") + wxString::Format(wxT("%f"), pitchCorrection));
-	wxString wcRef = GOODF_functions::number_format(::wxGetApp().m_frame->m_organ->getIndexOfOrganWindchest(windchest));
-	outFile->AddLine(wxT("WindchestGroup=") + wcRef);
-	if (percussive != windchest->getIsPercussive()) {
-		if (percussive) {
-			outFile->AddLine(wxT("Percussive=Y"));
-			if (hasIndependentRelease) {
-				outFile->AddLine(wxT("HasIndependentRelease=Y"));
+	if (windchest) {
+		wxString wcRef = GOODF_functions::number_format(::wxGetApp().m_frame->m_organ->getIndexOfOrganWindchest(windchest));
+		outFile->AddLine(wxT("WindchestGroup=") + wcRef);
+		if (percussive != windchest->getIsPercussive()) {
+			if (percussive) {
+				outFile->AddLine(wxT("Percussive=Y"));
+				if (hasIndependentRelease) {
+					outFile->AddLine(wxT("HasIndependentRelease=Y"));
+				}
+			} else {
+				outFile->AddLine(wxT("Percussive=N"));
 			}
-		} else {
-			outFile->AddLine(wxT("Percussive=N"));
 		}
 	}
 	if (minVelocityVolume != 100)
@@ -198,7 +202,7 @@ void Rank::read(wxFileConfig *cfg, Organ *readOrgan) {
 	if (pitchCorr >= -1800 && pitchCorr <= 1800) {
 		setPitchCorrection(pitchCorr);
 	}
-	int windchestRef = static_cast<int>(cfg->ReadLong("WindchestGroup", 1));
+	int windchestRef = static_cast<int>(cfg->ReadLong("WindchestGroup", 0));
 	if (windchestRef > 0 && windchestRef <= (int) readOrgan->getNumberOfWindchestgroups()) {
 		setWindchest(readOrgan->getOrganWindchestgroupAt(windchestRef - 1));
 	}

version.txt

@@ -1 +1 @@
-0.11.0
+0.11.1