mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-22 14:26:00 +00:00
test build: merge fix/dashboard-every-session
This commit is contained in:
commit
46533ebf2e
1 file changed
+3
-2
@@ -581,6 +581,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
|||||||
val mode = intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM
|
val mode = intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM
|
||||||
SessionState.programArgs = intent.getStringArrayExtra(SessionService.EXTRA_PROGRAM_ARGS)?.toList().orEmpty()
|
SessionState.programArgs = intent.getStringArrayExtra(SessionService.EXTRA_PROGRAM_ARGS)?.toList().orEmpty()
|
||||||
SessionEvents.begin(this, mode, SessionPaths.label(mode, intent.getStringExtra(SessionService.EXTRA_PROGRAM)))
|
SessionEvents.begin(this, mode, SessionPaths.label(mode, intent.getStringExtra(SessionService.EXTRA_PROGRAM)))
|
||||||
|
// begin() moves the phase on, so the block below never runs for a new session; reset per-session flags here.
|
||||||
|
SessionState.secondScreenAutoOpened = false
|
||||||
|
SessionState.secondScreenProvisional = false
|
||||||
}
|
}
|
||||||
if (!SessionState.running && SessionState.phase in setOf(SessionPhase.IDLE, SessionPhase.FAILED)) {
|
if (!SessionState.running && SessionState.phase in setOf(SessionPhase.IDLE, SessionPhase.FAILED)) {
|
||||||
SessionState.program = intent.getStringExtra(SessionService.EXTRA_PROGRAM)
|
SessionState.program = intent.getStringExtra(SessionService.EXTRA_PROGRAM)
|
||||||
@@ -588,8 +591,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
|||||||
SessionState.steamUi = intent.getStringExtra(SessionService.EXTRA_STEAM_UI)
|
SessionState.steamUi = intent.getStringExtra(SessionService.EXTRA_STEAM_UI)
|
||||||
SessionState.steamUrl = intent.getStringExtra(SessionService.EXTRA_STEAM_URL)
|
SessionState.steamUrl = intent.getStringExtra(SessionService.EXTRA_STEAM_URL)
|
||||||
SessionState.steamVr = intent.getBooleanExtra(EXTRA_STEAMVR, false)
|
SessionState.steamVr = intent.getBooleanExtra(EXTRA_STEAMVR, false)
|
||||||
SessionState.secondScreenAutoOpened = false
|
|
||||||
SessionState.secondScreenProvisional = false
|
|
||||||
} else if (intent.getBooleanExtra(EXTRA_STEAMVR, false) && SessionState.mode == SessionService.MODE_STEAM) {
|
} else if (intent.getBooleanExtra(EXTRA_STEAMVR, false) && SessionState.mode == SessionService.MODE_STEAM) {
|
||||||
SessionState.steamVr = true
|
SessionState.steamVr = true
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user