Use conf.fatal for fatal configuration errors

[ardour.git] / scripts / meter_tap.lua

diff --git a/scripts/meter_tap.lua b/scripts/meter_tap.lua
index c2fa204f9a4fc0258e49071da39e195a9feb8176..645af522bd7e97003d46a57dcf3be43d2687dce7 100644 (file)
--- a/scripts/meter_tap.lua
+++ b/scripts/meter_tap.lua
@@ -17,33 +17,26 @@ function factory () return function ()
        }
 
        local rv = LuaDialog.Dialog("Change all Meter Taps:", dialog_options):run()
+       if not rv then return end -- user cancelled
 
-       meter_point = rv['select']
+       local rl;
        if rv['select-tracks'] then
-               local sel = Editor:get_selection ()
-               for route in sel.tracks:routelist():iter() do
-                       if not(route:to_track():isnil()) then
-                               if rv['rec-tracks'] then
-                                       if route:rec_enable_control():get_value() == 1.0 then
-                                               route:to_track():set_meter_point(meter_point, false)
-                                       end
-                               else
-                                       route:to_track():set_meter_point(meter_point, false)
-                               end
-                       end
-               end
+               rl = Editor:get_selection ()
        else
-               for route in Session:get_routes():iter() do
-                       if not(route:to_track():isnil()) then
-                               if rv['rec-tracks'] then
-                                       if route:rec_enable_control():get_value() == 1.0 then
-                                               route:to_track():set_meter_point(meter_point, false)
-                                       end
-                               else
+               rl = Session:get_routes()
+       end
+
+       local meter_point = rv['select']
+
+       for route in rl:iter() do
+               if not(route:to_track():isnil()) then
+                       if rv['rec-tracks'] then
+                               if route:rec_enable_control():get_value() == 1.0 then
                                        route:to_track():set_meter_point(meter_point, false)
                                end
+                       else
+                               route:to_track():set_meter_point(meter_point, false)
                        end
                end
        end
-       
 end end