SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes an application crash when Revive is not installed.

Browse Source
This commit is contained in:
matzman
2017-01-07 18:54:49 +01:00
parent e930a63546
commit 6b65b66f8e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlaycontroller.cpp
+1 -1
View File
@@ -112,7 +112,7 @@ void OverlayController::Init(QQmlEngine* qmlEngine) {
audioTabController.initStage1(); audioTabController.initStage1();
statisticsTabController.initStage1(); statisticsTabController.initStage1();
settingsTabController.initStage1(); settingsTabController.initStage1();
reviveTabController.initStage1(); reviveTabController.initStage1(settingsTabController.forceRevivePage());
utilitiesTabController.initStage1(); utilitiesTabController.initStage1();
// Set qml context // Set qml context
src/tabcontrollers/ReviveTabController.cpp
+2 -2
View File
@@ -24,9 +24,9 @@ namespace advsettings {
const char* key_piGender = "Gender"; const char* key_piGender = "Gender";
void ReviveTabController::initStage1() { void ReviveTabController::initStage1(bool forceRevivePage) {
m_isOverlayInstalled = vr::VRApplications()->IsApplicationInstalled(appkey_overlay); m_isOverlayInstalled = vr::VRApplications()->IsApplicationInstalled(appkey_overlay);
if (m_isOverlayInstalled || parent->settingsTabController.forceRevivePage()) { if (m_isOverlayInstalled || forceRevivePage) {
vr::EVRSettingsError vrSettingsError; vr::EVRSettingsError vrSettingsError;
float valuef = vr::VRSettings()->GetFloat(section_revive, key_pixelsPerDisplayPixel, &vrSettingsError); float valuef = vr::VRSettings()->GetFloat(section_revive, key_pixelsPerDisplayPixel, &vrSettingsError);
src/tabcontrollers/ReviveTabController.h
+1 -1
View File
@@ -73,7 +73,7 @@ namespace advsettings {
std::vector<ReviveControllerProfile> controllerProfiles; std::vector<ReviveControllerProfile> controllerProfiles;
public: public:
void initStage1(); void initStage1(bool forceRevivePage);
void initStage2(OverlayController* parent, QQuickWindow* widget); void initStage2(OverlayController* parent, QQuickWindow* widget);
void eventLoopTick(); void eventLoopTick();