diff --git a/build_scripts/compile_version_string.txt b/build_scripts/compile_version_string.txt index a992d2e..58b5ac4 100644 --- a/build_scripts/compile_version_string.txt +++ b/build_scripts/compile_version_string.txt @@ -1 +1 @@ -5.0.1-dev \ No newline at end of file +5.0.2-release \ No newline at end of file diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp index ccd8571..00e87be 100644 --- a/src/overlaycontroller.cpp +++ b/src/overlaycontroller.cpp @@ -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, diff --git a/src/res/qml/video_page/brightness/BrightnessGroupBox.qml b/src/res/qml/video_page/brightness/BrightnessGroupBox.qml index 18e9f07..9371cfa 100644 --- a/src/res/qml/video_page/brightness/BrightnessGroupBox.qml +++ b/src/res/qml/video_page/brightness/BrightnessGroupBox.qml @@ -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 } diff --git a/src/tabcontrollers/MoveCenterTabController.h b/src/tabcontrollers/MoveCenterTabController.h index c6be9af..3b4a0a3 100644 --- a/src/tabcontrollers/MoveCenterTabController.h +++ b/src/tabcontrollers/MoveCenterTabController.h @@ -46,6 +46,7 @@ struct OffsetProfile : settings::ISettingsObject { settings::SettingsObjectData o; + o.addValue( profileName ); o.addValue( static_cast( offsetX ) ); o.addValue( static_cast( offsetY ) ); o.addValue( static_cast( offsetZ ) ); @@ -57,6 +58,7 @@ struct OffsetProfile : settings::ISettingsObject virtual void loadSettings( settings::SettingsObjectData& obj ) override { + profileName = ( obj.getNextValueOrDefault( "" ) ); offsetX = static_cast( obj.getNextValueOrDefault( 0.0 ) ); offsetY = static_cast( obj.getNextValueOrDefault( 0.0 ) ); offsetZ = static_cast( obj.getNextValueOrDefault( 0.0 ) ); diff --git a/src/tabcontrollers/VideoTabController.h b/src/tabcontrollers/VideoTabController.h index 6de2c10..6aadb7e 100644 --- a/src/tabcontrollers/VideoTabController.h +++ b/src/tabcontrollers/VideoTabController.h @@ -41,6 +41,7 @@ struct VideoProfile : settings::ISettingsObject { settings::SettingsObjectData o; + o.addValue( profileName ); o.addValue( static_cast( 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( obj.getNextValueOrDefault( 1.0 ) ); anisotropicFiltering = obj.getNextValueOrDefault( false ); diff --git a/ver/versioncheck.json b/ver/versioncheck.json index a23af52..1f00c03 100644 --- a/ver/versioncheck.json +++ b/ver/versioncheck.json @@ -1 +1 @@ -{ "major": 5, "minor": 0, "patch": 1, "updateMessage": "", "optionalMessage": "" } \ No newline at end of file +{ "major": 5, "minor": 0, "patch": 2, "updateMessage": "", "optionalMessage": "" } \ No newline at end of file