From 3df8a16de1633f95cc5ea75b279af801008d4086 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Mon, 28 Dec 2020 09:37:40 +0800 Subject: [PATCH] 1.1.30 oops - need to short circuit the tunnel check BEFORE the and --- meshtastic/__main__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meshtastic/__main__.py b/meshtastic/__main__.py index eed40ca..41e0a3d 100644 --- a/meshtastic/__main__.py +++ b/meshtastic/__main__.py @@ -278,7 +278,7 @@ def onConnected(interface): url = pyqrcode.create(interface.channelURL) print(url.terminal()) - if args.tunnel and have_tunnel: + if have_tunnel and args.tunnel : closeNow = False # Even if others said we could close, stay open if the user asked for a tunnel tunnel.Tunnel(interface, subnet=args.tunnel_net) diff --git a/setup.py b/setup.py index 655f35e..f7954d4 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ with open("README.md", "r") as fh: # This call to setup() does all the work setup( name="meshtastic", - version="1.1.29", + version="1.1.30", description="Python API & client shell for talking to Meshtastic devices", long_description=long_description, long_description_content_type="text/markdown",