Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-12-10 05:56:37 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into basic_auth_everywhere

Browse source
This commit is contained in:
Micah Lee 2019-05-24 18:13:44 -07:00
commit c53ecb0a03
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
onionshare_gui/mode/website_mode/__init__.py
View file

@ -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

5
onionshare_gui/onionshare_gui.py
View file

@ -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_()