mirror of
https://scm.osdn.net/gitroot/planet/planet-launcher.git
synced 2024-06-15 16:26:37 +00:00
Fix conflicts
This commit is contained in:
commit
0c5c3cfa27
|
@ -67,4 +67,4 @@ def set_options(env, options: dict):
|
||||||
def run(env, path_: str):
|
def run(env, path_: str):
|
||||||
return subprocess.Popen(
|
return subprocess.Popen(
|
||||||
[path_], env=env, preexec_fn=os.setsid
|
[path_], env=env, preexec_fn=os.setsid
|
||||||
)
|
).wait()
|
||||||
|
|
|
@ -281,7 +281,8 @@ class Planet(QMainWindow):
|
||||||
)
|
)
|
||||||
|
|
||||||
print(self.env)
|
print(self.env)
|
||||||
self.hide()
|
if self.showlauncher.isChecked() == True:
|
||||||
|
self.hide()
|
||||||
launcher.run(self.env)
|
launcher.run(self.env)
|
||||||
self.show()
|
self.show()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user