almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Pass common into Installer, so Docker Desktop for Windows installer will run

Browse source
This commit is contained in:
Micah Lee 2020-02-20 09:38:49 -08:00
parent 960956bc95
commit 81627379f6
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dangerzone/docker_installer.py
View file

@ -175,7 +175,7 @@ class DockerInstaller(QtWidgets.QDialog):
self.timer.start(10) self.timer.start(10)
def start_installer(self): def start_installer(self):
self.install_t = Installer(self.installer_filename) self.install_t = Installer(self.common, self.installer_filename)
self.install_t.install_finished.connect(self.install_finished) self.install_t.install_finished.connect(self.install_finished)
self.install_t.install_failed.connect(self.install_failed) self.install_t.install_failed.connect(self.install_failed)
self.install_t.update_task_label.connect(self.update_task_label) self.install_t.update_task_label.connect(self.update_task_label)
@ -243,8 +243,9 @@ class Installer(QtCore.QThread):
install_failed = QtCore.pyqtSignal(str) install_failed = QtCore.pyqtSignal(str)
update_task_label = QtCore.pyqtSignal(str) update_task_label = QtCore.pyqtSignal(str)
def __init__(self, installer_filename): def __init__(self, common, installer_filename):
super(Installer, self).__init__() super(Installer, self).__init__()
self.common = common
self.installer_filename = installer_filename self.installer_filename = installer_filename
def run(self): def run(self):
@ -286,7 +287,7 @@ class Installer(QtCore.QThread):
# Run the installer # Run the installer
subprocess.run( subprocess.run(
[self.installer_filename], [self.installer_filename],
startupinfo=common.get_subprocess_startupinfo(), startupinfo=self.common.get_subprocess_startupinfo(),
) )
self.install_finished.emit() self.install_finished.emit()