Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] master from LibreVR:master #76

Merged
merged 9 commits into from
Oct 3, 2019
Merged

[pull] master from LibreVR:master #76

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
df78cac
README.md: add basic build instructions
qlyoung Oct 2, 2019
89df289
ReviveInjector: fix arg parsing bug
qlyoung Oct 3, 2019
e774df8
ReviveXR: fix malformed input subpaths
qlyoung Oct 3, 2019
0a62f7d
ReviveXR: initialize misc XR structs
qlyoung Oct 3, 2019
5eeffdd
ReviveXR: fix dummy session management
qlyoung Oct 3, 2019
1de7215
ReviveInjector: change XR loader dll to 1.0
qlyoung Oct 3, 2019
70592a2
ReviveXR: gracefully handle session shutdown
qlyoung Oct 3, 2019
cc4de5a
Merge pull request #1337 from qlyoung/readme-add-build-instructions
CrossVR Oct 3, 2019
56294eb
Merge pull request #1338 from qlyoung/xr
CrossVR Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ReviveXR: gracefully handle session shutdown 
As with the dummy session, request and wait for XR to shut itself down.

Signed-off-by: Quentin Young <qlyoung@qlyoung.net>
  • Loading branch information
@qlyoung
qlyoung committed Oct 3, 2019
commit 70592a2ca6aa9cf32272369f85014f0cb31b34d1
5 changes: 3 additions & 2 deletions ReviveXR/REV_CAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,9 @@ OVR_PUBLIC_FUNCTION(void) ovr_Destroy(ovrSession session)
XrSession handle = session->Session;
if (handle)
{
XrResult rs = xrEndSession(handle);
assert(XR_SUCCEEDED(rs));
xrRequestExitSession(session->Session);
while (!XR_SUCCEEDED(xrEndSession(handle)))
std::this_thread::sleep_for(std::chrono::milliseconds(100));
}

if (session->HookedFunction)
Expand Down