Skip to content

Commit b316e0e

Browse files
rsjaffersjaffe
committed
Expand lock for change of profile--attempt to fix crash; update build #
1 parent e0d448f commit b316e0e

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
lines changed

‎Builds/MacOSX/Info-App.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<key>CFBundleSignature</key>
1919
<string>????</string>
2020
<key>CFBundleShortVersionString</key>
21-
<string>2.9.0.1</string>
21+
<string>2.9.0.2</string>
2222
<key>CFBundleVersion</key>
23-
<string>2.9.0.1</string>
23+
<string>2.9.0.2</string>
2424
<key>NSHumanReadableCopyright</key>
2525
<string></string>
2626
<key>NSHighResolutionCapable</key>

‎Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@
281281
"U_STATIC_IMPLEMENTATION=1",
282282
"GSL_THROW_ON_CONTRACT_VIOLATION=1",
283283
"JUCER_XCODE_MAC_F6D2F4CF=1",
284-
"JUCE_APP_VERSION=2.9.0.1",
285-
"JUCE_APP_VERSION_HEX=0x2090001",
284+
"JUCE_APP_VERSION=2.9.0.2",
285+
"JUCE_APP_VERSION_HEX=0x2090002",
286286
"JucePlugin_Build_VST=0",
287287
"JucePlugin_Build_VST3=0",
288288
"JucePlugin_Build_AU=0",
@@ -316,8 +316,8 @@
316316
"U_STATIC_IMPLEMENTATION=1",
317317
"GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1",
318318
"JUCER_XCODE_MAC_F6D2F4CF=1",
319-
"JUCE_APP_VERSION=2.9.0.1",
320-
"JUCE_APP_VERSION_HEX=0x2090001",
319+
"JUCE_APP_VERSION=2.9.0.2",
320+
"JUCE_APP_VERSION_HEX=0x2090002",
321321
"JucePlugin_Build_VST=0",
322322
"JucePlugin_Build_VST3=0",
323323
"JucePlugin_Build_AU=0",

‎Builds/VisualStudio2017/MIDI2LR_App.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<Optimization>Disabled</Optimization>
7676
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
7777
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
78-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;U_STATIC_IMPLEMENTATION=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.0.1;JUCE_APP_VERSION_HEX=0x2090001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
78+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;U_STATIC_IMPLEMENTATION=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.0.2;JUCE_APP_VERSION_HEX=0x2090002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7979
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
8080
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8181
<PrecompiledHeader/>
@@ -116,7 +116,7 @@
116116
<ClCompile>
117117
<Optimization>Full</Optimization>
118118
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;U_STATIC_IMPLEMENTATION=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.0.1;JUCE_APP_VERSION_HEX=0x2090001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
119+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;U_STATIC_IMPLEMENTATION=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.0.2;JUCE_APP_VERSION_HEX=0x2090002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
120120
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
121121
<RuntimeTypeInfo>true</RuntimeTypeInfo>
122122
<PrecompiledHeader/>

‎Builds/VisualStudio2017/resources.rc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
#include <windows.h>
88

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 2,9,0,1
10+
FILEVERSION 2,9,0,2
1111
BEGIN
1212
BLOCK "StringFileInfo"
1313
BEGIN
1414
BLOCK "040904E4"
1515
BEGIN
1616
VALUE "FileDescription", "MIDI2LR\0"
17-
VALUE "FileVersion", "2.9.0.1\0"
17+
VALUE "FileVersion", "2.9.0.2\0"
1818
VALUE "ProductName", "MIDI2LR\0"
19-
VALUE "ProductVersion", "2.9.0.1\0"
19+
VALUE "ProductVersion", "2.9.0.2\0"
2020
END
2121
END
2222

‎DoxyGen/Midi2lr.Doxyfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = MIDI2LR
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 2.9.0.1
41+
PROJECT_NUMBER = 2.9.0.2
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎Installer/MIDI2LR.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project>
22
<shortName>MIDI2LR</shortName>
33
<fullName>MIDI2LR</fullName>
4-
<version>2.9.0.1</version>
4+
<version>2.9.0.2</version>
55
<readmeFile>../Source/LRPlugin/ReadMe.txt</readmeFile>
66
<licenseFile>../LICENSE.txt</licenseFile>
77
<htmlLicenseFile>LICENSE.html</htmlLicenseFile>

‎JuceLibraryCode/JuceHeader.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
namespace ProjectInfo
3535
{
3636
const char* const projectName = "MIDI2LR";
37-
const char* const versionString = "2.9.0.1";
38-
const int versionNumber = 0x2090001;
37+
const char* const versionString = "2.9.0.2";
38+
const int versionNumber = 0x2090002;
3939
}
4040
#endif

‎MIDI2LR.jucer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="2.9.0.1"
3+
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="2.9.0.2"
44
bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
55
jucerVersion="5.2.1" companyWebsite="http://rsjaffe.github.io/MIDI2LR/"
66
companyEmail="rsjaffe@gmail.com" displaySplashScreen="0" reportAppUsage="0"

‎Source/LRPlugin/MIDI2LR.lrplugin/Info.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,5 @@ return {
7070
},
7171

7272
},
73-
VERSION = { major=2, minor=9, revision=0, build=1}
73+
VERSION = { major=2, minor=9, revision=0, build=2}
7474
}

‎Source/MainComponent.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,9 @@ void MainContentComponent::buttonClicked(juce::Button* button)
351351
void MainContentComponent::ProfileChanged(
352352
juce::XmlElement* xml_element, const juce::String& file_name)
353353
{ //-V2009 overridden method
354-
command_table_model_.BuildFromXml(xml_element);
355354
{
356355
const MessageManagerLock mmLock;
356+
command_table_model_.BuildFromXml(xml_element);
357357
command_table_.updateContent();
358358
command_table_.repaint();
359359
profile_name_label_.setText(file_name, juce::NotificationType::dontSendNotification);

0 commit comments

Comments
 (0)