Fixes Startup Error, and ghost profiles 5.0.2 (#422)

* fixed unsafe chaperone issue

* fixed phantom names on offset/video profiles

* version strings
This commit is contained in:
ykeara
2020-04-20 12:44:29 -05:00
committed by GitHub
parent b1b0257133
commit deb0d4a324
6 changed files with 12 additions and 7 deletions
+1 -1
View File
@@ -1 +1 @@
5.0.1-dev
5.0.2-release
+4 -3
View File
@@ -329,6 +329,9 @@ OverlayController::~OverlayController()
void OverlayController::exitApp()
{
// save to settings that shutdown was safe
setPreviousShutdownSafe( true );
settings::saveAllSettings();
m_moveCenterTabController.shutdown();
@@ -337,6 +340,7 @@ void OverlayController::exitApp()
// m_audioTabController.setMicMuted( false, false );
m_audioTabController.shutdown();
m_chaperoneTabController.shutdown();
Shutdown();
QApplication::exit();
@@ -371,9 +375,6 @@ void OverlayController::Shutdown()
m_pRenderTimer.reset();
}
m_pFbo.reset();
// save to settings that shutdown was safe
setPreviousShutdownSafe( true );
}
void OverlayController::SetWidget( QQuickItem* quickItem,
@@ -76,8 +76,8 @@ GroupBox {
function onInputEvent(input) {
var val = parseFloat(input)
if (!isNaN(val)) {
if (val < 5) {
val = 5
if (val < 10) {
val = 10
} else if (val > 100.0) {
val = 100.0
}
@@ -46,6 +46,7 @@ struct OffsetProfile : settings::ISettingsObject
{
settings::SettingsObjectData o;
o.addValue( profileName );
o.addValue( static_cast<double>( offsetX ) );
o.addValue( static_cast<double>( offsetY ) );
o.addValue( static_cast<double>( offsetZ ) );
@@ -57,6 +58,7 @@ struct OffsetProfile : settings::ISettingsObject
virtual void loadSettings( settings::SettingsObjectData& obj ) override
{
profileName = ( obj.getNextValueOrDefault( "" ) );
offsetX = static_cast<float>( obj.getNextValueOrDefault( 0.0 ) );
offsetY = static_cast<float>( obj.getNextValueOrDefault( 0.0 ) );
offsetZ = static_cast<float>( obj.getNextValueOrDefault( 0.0 ) );
+2
View File
@@ -41,6 +41,7 @@ struct VideoProfile : settings::ISettingsObject
{
settings::SettingsObjectData o;
o.addValue( profileName );
o.addValue( static_cast<double>( supersampling ) );
o.addValue( anisotropicFiltering );
@@ -64,6 +65,7 @@ struct VideoProfile : settings::ISettingsObject
virtual void loadSettings( settings::SettingsObjectData& obj ) override
{
profileName = obj.getNextValueOrDefault( "" );
supersampling = static_cast<float>( obj.getNextValueOrDefault( 1.0 ) );
anisotropicFiltering = obj.getNextValueOrDefault( false );
+1 -1
View File
@@ -1 +1 @@
{ "major": 5, "minor": 0, "patch": 1, "updateMessage": "", "optionalMessage": "" }
{ "major": 5, "minor": 0, "patch": 2, "updateMessage": "", "optionalMessage": "" }