Merge branch 'mig5-495_clear_status_bar_early'

This commit is contained in:
Micah Lee 2018-01-13 16:12:13 -08:00
commit 4374d5cef2
No known key found for this signature in database
GPG key ID: 403C2657CD994F73

View file

@ -238,6 +238,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
# Hide and reset the downloads if we have previously shared # Hide and reset the downloads if we have previously shared
self.downloads_container.hide() self.downloads_container.hide()
self.downloads.reset_downloads() self.downloads.reset_downloads()
self.status_bar.clearMessage()
# Reset web counters # Reset web counters
web.download_count = 0 web.download_count = 0
@ -278,7 +279,6 @@ class OnionShareGui(QtWidgets.QMainWindow):
self._zip_progress_bar = ZipProgressBar(0) self._zip_progress_bar = ZipProgressBar(0)
self._zip_progress_bar.total_files_size = OnionShareGui._compute_total_size( self._zip_progress_bar.total_files_size = OnionShareGui._compute_total_size(
self.file_selection.file_list.filenames) self.file_selection.file_list.filenames)
self.status_bar.clearMessage()
self.status_bar.insertWidget(0, self._zip_progress_bar) self.status_bar.insertWidget(0, self._zip_progress_bar)
# prepare the files for sending in a new thread # prepare the files for sending in a new thread