Fixed plugin crash on startup.

mtytel · Sep 8, 2015 · cab597b · cab597b
1 parent a85cd18
commit cab597b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/common/load_save.cpp b/src/common/load_save.cpp
@@ -164,8 +164,8 @@ void LoadSave::saveConfig(MidiManager* midi_manager, mopo::StringLayout* layout)
   // Computer Keyboard Layout
   DynamicObject* layout_object = new DynamicObject();
   String chromatic_layout;
-  wchar_t up_key = NULL;
-  wchar_t down_key = NULL;
+  wchar_t up_key = L'\0';
+  wchar_t down_key = L'\0';
 
   if (layout) {
     chromatic_layout = String(layout->getLayout().data());
@@ -260,6 +260,10 @@ void LoadSave::loadConfig(MidiManager* midi_manager, mopo::StringLayout* layout)
 
 std::wstring LoadSave::getComputerKeyboardLayout() {
   var config_state = getConfigVar();
+
+  if (config_state.isVoid())
+    return mopo::DEFAULT_KEYBOARD;
+
   DynamicObject* config_object = config_state.getDynamicObject();
   NamedValueSet config_properties = config_object->getProperties();
 
@@ -277,6 +281,9 @@ std::pair<wchar_t, wchar_t> LoadSave::getComputerKeyboardOctaveControls() {
   std::pair<wchar_t, wchar_t> octave_controls(mopo::DEFAULT_KEYBOARD_OCTAVE_DOWN,
                                               mopo::DEFAULT_KEYBOARD_OCTAVE_UP);
   var config_state = getConfigVar();
+  if (config_state.isVoid())
+    return octave_controls;
+
   DynamicObject* config_object = config_state.getDynamicObject();
   NamedValueSet config_properties = config_object->getProperties();
 

diff --git a/src/plugin/helm_plugin.cpp b/src/plugin/helm_plugin.cpp
@@ -29,7 +29,7 @@ HelmPlugin::HelmPlugin() {
   midi_manager_ = new MidiManager(&synth_, &getCallbackLock());
 
   Startup::doStartupChecks(midi_manager_);
-  
+
   controls_ = synth_.getControls();
   for (auto control : controls_) {
     ValueBridge* bridge = new ValueBridge(control.first, control.second);