Fix conflicts

planet/launcher.py

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

planet/main.py

@@ -281,7 +281,8 @@ class Planet(QMainWindow):
         )
 
         print(self.env)
-        self.hide()
+        if self.showlauncher.isChecked() == True:
+            self.hide()
         launcher.run(self.env)
         self.show()