Merge remote-tracking branch 'refs/remotes/origin/develop'

rsjaffe · Feb 3, 2016 · 34d8eb6 · 34d8eb6
2 parents dcdb0c3 + 8a2e2a1
commit 34d8eb6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/Source/LRPlugin/MIDI2LR.lrplugin/Info.lua b/Source/LRPlugin/MIDI2LR.lrplugin/Info.lua
@@ -46,5 +46,5 @@ return {
     },
     --]]
   },
-  VERSION = { major=0, minor=9, revision=5, build=1}
+  VERSION = { major=0, minor=9, revision=5, build=2}
 }
diff --git a/Source/LRPlugin/MIDI2LR.lrplugin/Limits.lua b/Source/LRPlugin/MIDI2LR.lrplugin/Limits.lua
@@ -48,12 +48,14 @@ for _, p in ipairs(DisplayOrder) do
 end
 
 --clean up the preferences of discarded Limits and fix label and order
-for k,v in pairs(ProgramPreferences.Limits) do
-  if Parameters[k] then
-    ProgramPreferences.Limits[k]['label'] = ParamList.LimitEligible[k][1]
-    ProgramPreferences.Limits[k]['order'] = ParamList.LimitEligible[k][2]
-  else
-    ProgramPreferences.Limits[k] = nil --erase unused
+if ProgramPreferences.Limits ~= nil and type(ProgramPreferences.Limits)=='table' then
+  for k,v in pairs(ProgramPreferences.Limits) do
+    if Parameters[k] then
+      ProgramPreferences.Limits[k]['label'] = ParamList.LimitEligible[k][1]
+      ProgramPreferences.Limits[k]['order'] = ParamList.LimitEligible[k][2]
+    else
+      ProgramPreferences.Limits[k] = nil --erase unused
+    end
   end
 end