External, Non-PPA KXStudio Repository
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

43 lines
2.0KB

  1. diff --git a/src/cadence.py b/src/cadence.py
  2. index 277abcd..699b0f0 100755
  3. --- a/src/cadence.py
  4. +++ b/src/cadence.py
  5. @@ -2135,7 +2135,7 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
  6. usingAlsaLoop = bool(GlobalSettings.value("ALSA-Audio/BridgeIndexType", iAlsaFileNone, type=int) == iAlsaFileLoop)
  7. - self.cb_jack_autostart.setChecked(GlobalSettings.value("JACK/AutoStart", False, type=bool))
  8. + self.cb_jack_autostart.setChecked(GlobalSettings.value("JACK/AutoStart", wantJackStart, type=bool))
  9. self.cb_a2j_autostart.setChecked(GlobalSettings.value("A2J/AutoStart", True, type=bool))
  10. self.cb_pulse_autostart.setChecked(GlobalSettings.value("Pulse2JACK/AutoStart", havePulseAudio and not usingAlsaLoop, type=bool))
  11. diff --git a/src/cadence_session_start.py b/src/cadence_session_start.py
  12. index 9c97f49..1fa6068 100755
  13. --- a/src/cadence_session_start.py
  14. +++ b/src/cadence_session_start.py
  15. @@ -43,7 +43,7 @@ def forceReset():
  16. # Start JACK, A2J and Pulse, according to user settings
  17. def startSession(systemStarted):
  18. # Check if JACK is set to auto-start
  19. - if systemStarted and not GlobalSettings.value("JACK/AutoStart", False, type=bool):
  20. + if systemStarted and not GlobalSettings.value("JACK/AutoStart", wantJackStart, type=bool):
  21. print("JACK is set to NOT auto-start on login")
  22. return True
  23. diff --git a/src/shared_cadence.py b/src/shared_cadence.py
  24. index 92c597e..67f9b9c 100644
  25. --- a/src/shared_cadence.py
  26. +++ b/src/shared_cadence.py
  27. @@ -69,6 +69,11 @@ iAlsaFileMax = 4
  28. GlobalSettings = QSettings("Cadence", "GlobalSettings")
  29. # ------------------------------------------------------------------------------------------------------------
  30. +# KXStudio Check
  31. +
  32. +wantJackStart = os.path.exists("/usr/share/kxstudio/config/config/Cadence/GlobalSettings.conf")
  33. +
  34. +# ------------------------------------------------------------------------------------------------------------
  35. # Get Process list
  36. def getProcList():