Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/luci.git] / applications / luci-app-vpnbypass / luasrc / controller / vpnbypass.lua

diff --git a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua
index ed6f4f4da48531a9dfba58afca4faab1156f2991..56221e043ff86136371ba5fe5927adc0fd368c64 100644 (file)
--- a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua
+++ b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua
@@ -1,7 +1,10 @@
 module("luci.controller.vpnbypass", package.seeall)
 function index()
-       if not nixio.fs.access("/etc/config/vpnbypass") then
-               return
+       if nixio.fs.access("/etc/config/vpnbypass") then
+               if luci.dispatcher.lookup("admin/vpn") then
+                       entry({"admin", "vpn", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass"))
+               else
+                       entry({"admin", "services", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass"))
+               end
        end
-       entry({"admin", "services", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass"))
 end