mirror of
https://scm.osdn.net/gitroot/planet/planet-launcher.git
synced 2024-08-15 03:28:13 +00:00
Fix conflicts
This commit is contained in:
commit
0c5c3cfa27
2 changed files with 3 additions and 2 deletions
|
@ -67,4 +67,4 @@ def set_options(env, options: dict):
|
|||
def run(env, path_: str):
|
||||
return subprocess.Popen(
|
||||
[path_], env=env, preexec_fn=os.setsid
|
||||
)
|
||||
).wait()
|
||||
|
|
|
@ -281,6 +281,7 @@ class Planet(QMainWindow):
|
|||
)
|
||||
|
||||
print(self.env)
|
||||
if self.showlauncher.isChecked() == True:
|
||||
self.hide()
|
||||
launcher.run(self.env)
|
||||
self.show()
|
||||
|
|
Loading…
Reference in a new issue