diff options
| author | Micah Lee <micah@micahflee.com> | 2019-05-24 18:13:44 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2019-05-24 18:13:44 -0700 |
| commit | c53ecb0a0390541503fbf84c55a320ff1b7faab8 (patch) | |
| tree | c65d14c5e7d4918b9eb323f65bf88466b84fa0bb /onionshare_gui | |
| parent | dc556d89f51d94c007fdda9a9e2c859176f12eea (diff) | |
| parent | 35c373b5a35e4533090d548892e84b4c7fd188a7 (diff) | |
| download | onionshare-c53ecb0a0390541503fbf84c55a320ff1b7faab8.tar.gz onionshare-c53ecb0a0390541503fbf84c55a320ff1b7faab8.zip | |
Merge branch 'develop' into basic_auth_everywhere
Diffstat (limited to 'onionshare_gui')
| -rw-r--r-- | onionshare_gui/mode/website_mode/__init__.py | 1 | ||||
| -rw-r--r-- | onionshare_gui/onionshare_gui.py | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/onionshare_gui/mode/website_mode/__init__.py b/onionshare_gui/mode/website_mode/__init__.py index ef7df94e..50af4725 100644 --- a/onionshare_gui/mode/website_mode/__init__.py +++ b/onionshare_gui/mode/website_mode/__init__.py @@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. """ import os -import secrets import random import string diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py index c5e7dc24..bed86895 100644 --- a/onionshare_gui/onionshare_gui.py +++ b/onionshare_gui/onionshare_gui.py @@ -374,13 +374,16 @@ class OnionShareGui(QtWidgets.QMainWindow): if not self.common.settings.get('autostop_timer'): self.share_mode.server_status.autostop_timer_container.hide() self.receive_mode.server_status.autostop_timer_container.hide() + self.website_mode.server_status.autostop_timer_container.hide() # If we switched off the auto-start timer setting, ensure the widget is hidden. if not self.common.settings.get('autostart_timer'): self.share_mode.server_status.autostart_timer_datetime = None self.receive_mode.server_status.autostart_timer_datetime = None + self.website_mode.server_status.autostart_timer_datetime = None self.share_mode.server_status.autostart_timer_container.hide() self.receive_mode.server_status.autostart_timer_container.hide() - + self.website_mode.server_status.autostart_timer_container.hide() + d = SettingsDialog(self.common, self.onion, self.qtapp, self.config, self.local_only) d.settings_saved.connect(reload_settings) d.exec_() |